diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-23 15:47:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-23 18:43:42 +0200 |
| commit | 888dcb7cb26fb85dfe3486d28a2431d69d3e8148 (patch) | |
| tree | aad6f0dba4bdb63bc72280ed51a79f7dea284278 /sound/aoa/core | |
| parent | 72474be62d6ec2e0337ff01ecbd737f9c5c242c7 (diff) | |
| download | linux-888dcb7cb26fb85dfe3486d28a2431d69d3e8148.tar.bz2 | |
ALSA: aoa: clean up file names
This cleans up the apple onboard audio driver filenames.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/aoa/core')
| -rw-r--r-- | sound/aoa/core/Makefile | 8 | ||||
| -rw-r--r-- | sound/aoa/core/alsa.c (renamed from sound/aoa/core/snd-aoa-alsa.c) | 4 | ||||
| -rw-r--r-- | sound/aoa/core/alsa.h (renamed from sound/aoa/core/snd-aoa-alsa.h) | 0 | ||||
| -rw-r--r-- | sound/aoa/core/core.c (renamed from sound/aoa/core/snd-aoa-core.c) | 2 | ||||
| -rw-r--r-- | sound/aoa/core/gpio-feature.c (renamed from sound/aoa/core/snd-aoa-gpio-feature.c) | 2 | ||||
| -rw-r--r-- | sound/aoa/core/gpio-pmf.c (renamed from sound/aoa/core/snd-aoa-gpio-pmf.c) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sound/aoa/core/Makefile b/sound/aoa/core/Makefile index 62dc7287f663..a1596e88c718 100644 --- a/sound/aoa/core/Makefile +++ b/sound/aoa/core/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_SND_AOA) += snd-aoa.o -snd-aoa-objs := snd-aoa-core.o \ - snd-aoa-alsa.o \ - snd-aoa-gpio-pmf.o \ - snd-aoa-gpio-feature.o +snd-aoa-objs := core.o \ + alsa.o \ + gpio-pmf.o \ + gpio-feature.o diff --git a/sound/aoa/core/snd-aoa-alsa.c b/sound/aoa/core/alsa.c index 17fe689ed287..617850463582 100644 --- a/sound/aoa/core/snd-aoa-alsa.c +++ b/sound/aoa/core/alsa.c @@ -6,7 +6,7 @@ * GPL v2, can be found in COPYING. */ #include <linux/module.h> -#include "snd-aoa-alsa.h" +#include "alsa.h" static int index = -1; module_param(index, int, 0444); @@ -64,7 +64,7 @@ int aoa_snd_device_new(snd_device_type_t type, { struct snd_card *card = aoa_get_card(); int err; - + if (!card) return -ENOMEM; err = snd_device_new(card, type, device_data, ops); diff --git a/sound/aoa/core/snd-aoa-alsa.h b/sound/aoa/core/alsa.h index 9669e4489cab..9669e4489cab 100644 --- a/sound/aoa/core/snd-aoa-alsa.h +++ b/sound/aoa/core/alsa.h diff --git a/sound/aoa/core/snd-aoa-core.c b/sound/aoa/core/core.c index 19fdae400687..10bec6c61382 100644 --- a/sound/aoa/core/snd-aoa-core.c +++ b/sound/aoa/core/core.c @@ -10,7 +10,7 @@ #include <linux/module.h> #include <linux/list.h> #include "../aoa.h" -#include "snd-aoa-alsa.h" +#include "alsa.h" MODULE_DESCRIPTION("Apple Onboard Audio Sound Driver"); MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/gpio-feature.c index 805dcbff2257..c93ad5dec66b 100644 --- a/sound/aoa/core/snd-aoa-gpio-feature.c +++ b/sound/aoa/core/gpio-feature.c @@ -5,7 +5,7 @@ * * GPL v2, can be found in COPYING. * - * This file contains the GPIO control routines for + * This file contains the GPIO control routines for * direct (through feature calls) access to the GPIO * registers. */ diff --git a/sound/aoa/core/snd-aoa-gpio-pmf.c b/sound/aoa/core/gpio-pmf.c index 5ca2220eac7d..5ca2220eac7d 100644 --- a/sound/aoa/core/snd-aoa-gpio-pmf.c +++ b/sound/aoa/core/gpio-pmf.c |