Commit 23ce1547 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

[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: default avatarTakashi Iwai <tiwai@suse.de>
parent c18f68e4

sound/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ snd-bt87x-objs := bt87x.o 
snd-cmipci-objs := cmipci.o

snd-cs4281-objs := cs4281.o

snd-cs5530-objs := cs5530.o

snd-ens1370-objs := ens1370.o

snd-ens1370-objs := ens1370.o ak4531_codec.o

snd-ens1371-objs := ens1371.o

snd-es1938-objs := es1938.o

snd-es1968-objs := es1968.o

sound/pci/ac97/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -6,8 +6,5 @@ 
snd-ac97-codec-y := ac97_codec.o ac97_pcm.o

snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o



snd-ak4531-codec-objs := ak4531_codec.o



# Toplevel Module Dependency

obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o
 
obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o

sound/pci/ac97/ak4531_codec.c→sound/pci/ak4531_codec.c

+6 −26
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_master, -6200, 200, 0); 
static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0);

static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0);



static struct snd_kcontrol_new snd_ak4531_controls[] = {

static struct snd_kcontrol_new snd_ak4531_controls[] __devinitdata = {



AK4531_DOUBLE_TLV("Master Playback Switch", 0,

		  AK4531_LMASTER, AK4531_RMASTER, 7, 7, 1, 1,
@@ -379,7 +379,8 @@ static u8 snd_ak4531_initial_map[0x19 + 1] = { 
	0x01		/* 19: Mic Amp Setup */

};



int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531,

int __devinit snd_ak4531_mixer(struct snd_card *card,

			       struct snd_ak4531 *_ak4531,

			       struct snd_ak4531 **rak4531)

{

	unsigned int idx;
@@ -476,7 +477,8 @@ static void snd_ak4531_proc_read(struct snd_info_entry *entry, 
		    ak4531->regs[AK4531_MIC_GAIN] & 1 ? "+30dB" : "+0dB");

}



static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531)

static void __devinit

snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531)

{

	struct snd_info_entry *entry;
@@ -484,25 +486,3 @@ static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak453 
		snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read);

}

#endif
 


EXPORT_SYMBOL(snd_ak4531_mixer);

#ifdef CONFIG_PM

EXPORT_SYMBOL(snd_ak4531_suspend);

EXPORT_SYMBOL(snd_ak4531_resume);

#endif



/*

 *  INIT part

 */



static int __init alsa_ak4531_init(void)

{

	return 0;

}



static void __exit alsa_ak4531_exit(void)

{

}



module_init(alsa_ak4531_init)

module_exit(alsa_ak4531_exit)