aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-05-30 03:22:22 -0400
committerTakashi Iwai <tiwai@suse.de>2008-05-30 03:26:09 -0400
commit23ce1547638443f0053dd674e728062c48ff0e39 (patch)
tree8b5fde61f1e55633c3420b8dd6f9794f1bf02067
parentc18f68e4d809a517ed8df540bac2993a4f14d9a4 (diff)
[ALSA] Make ak4531 local to ens1370 driver
The ak4531 module is used only by ens1370 driver (and unlikely that any other will use it ever). Let's make it local to ens1370. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/Makefile2
-rw-r--r--sound/pci/ac97/Makefile3
-rw-r--r--sound/pci/ak4531_codec.c (renamed from sound/pci/ac97/ak4531_codec.c)32
3 files changed, 7 insertions, 30 deletions
diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index 85ef14bc8056..65b25d221cd2 100644
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -13,7 +13,7 @@ snd-bt87x-objs := bt87x.o
13snd-cmipci-objs := cmipci.o 13snd-cmipci-objs := cmipci.o
14snd-cs4281-objs := cs4281.o 14snd-cs4281-objs := cs4281.o
15snd-cs5530-objs := cs5530.o 15snd-cs5530-objs := cs5530.o
16snd-ens1370-objs := ens1370.o 16snd-ens1370-objs := ens1370.o ak4531_codec.o
17snd-ens1371-objs := ens1371.o 17snd-ens1371-objs := ens1371.o
18snd-es1938-objs := es1938.o 18snd-es1938-objs := es1938.o
19snd-es1968-objs := es1968.o 19snd-es1968-objs := es1968.o
diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile
index ae36950f2568..41fa322f0971 100644
--- a/sound/pci/ac97/Makefile
+++ b/sound/pci/ac97/Makefile
@@ -6,8 +6,5 @@
6snd-ac97-codec-y := ac97_codec.o ac97_pcm.o 6snd-ac97-codec-y := ac97_codec.o ac97_pcm.o
7snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o 7snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o
8 8
9snd-ak4531-codec-objs := ak4531_codec.o
10
11# Toplevel Module Dependency 9# Toplevel Module Dependency
12obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o 10obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o
13obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o
diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ak4531_codec.c
index c0c1633999ea..6a99eed2d8b6 100644
--- a/sound/pci/ac97/ak4531_codec.c
+++ b/sound/pci/ak4531_codec.c
@@ -270,7 +270,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_master, -6200, 200, 0);
270static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0); 270static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0);
271static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0); 271static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0);
272 272
273static struct snd_kcontrol_new snd_ak4531_controls[] = { 273static struct snd_kcontrol_new snd_ak4531_controls[] __devinitdata = {
274 274
275AK4531_DOUBLE_TLV("Master Playback Switch", 0, 275AK4531_DOUBLE_TLV("Master Playback Switch", 0,
276 AK4531_LMASTER, AK4531_RMASTER, 7, 7, 1, 1, 276 AK4531_LMASTER, AK4531_RMASTER, 7, 7, 1, 1,
@@ -379,8 +379,9 @@ static u8 snd_ak4531_initial_map[0x19 + 1] = {
379 0x01 /* 19: Mic Amp Setup */ 379 0x01 /* 19: Mic Amp Setup */
380}; 380};
381 381
382int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531, 382int __devinit snd_ak4531_mixer(struct snd_card *card,
383 struct snd_ak4531 **rak4531) 383 struct snd_ak4531 *_ak4531,
384 struct snd_ak4531 **rak4531)
384{ 385{
385 unsigned int idx; 386 unsigned int idx;
386 int err; 387 int err;
@@ -476,7 +477,8 @@ static void snd_ak4531_proc_read(struct snd_info_entry *entry,
476 ak4531->regs[AK4531_MIC_GAIN] & 1 ? "+30dB" : "+0dB"); 477 ak4531->regs[AK4531_MIC_GAIN] & 1 ? "+30dB" : "+0dB");
477} 478}
478 479
479static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531) 480static void __devinit
481snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531)
480{ 482{
481 struct snd_info_entry *entry; 483 struct snd_info_entry *entry;
482 484
@@ -484,25 +486,3 @@ static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak453
484 snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read); 486 snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read);
485} 487}
486#endif 488#endif
487
488EXPORT_SYMBOL(snd_ak4531_mixer);
489#ifdef CONFIG_PM
490EXPORT_SYMBOL(snd_ak4531_suspend);
491EXPORT_SYMBOL(snd_ak4531_resume);
492#endif
493
494/*
495 * INIT part
496 */
497
498static int __init alsa_ak4531_init(void)
499{
500 return 0;
501}
502
503static void __exit alsa_ak4531_exit(void)
504{
505}
506
507module_init(alsa_ak4531_init)
508module_exit(alsa_ak4531_exit)