Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 848bffef authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Takashi Iwai
Browse files

ALSA: ali5451: remove dead code 



Remove code covered by #if/endif 0 and #ifdef/endif CODEC_RESET
(CODEC_RESET is never defined).

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 70bdbd3d

sound/pci/ali5451/ali5451.c

+0 −65
Original line number Diff line number Diff line
@@ -478,45 +478,6 @@ static int snd_ali_reset_5451(struct snd_ali *codec) 
	return 0;

}



#ifdef CODEC_RESET



static int snd_ali_reset_codec(struct snd_ali *codec)

{

	struct pci_dev *pci_dev;

	unsigned char bVal;

	unsigned int   dwVal;

	unsigned short wCount, wReg;



	pci_dev = codec->pci_m1533;

	

	pci_read_config_dword(pci_dev, 0x7c, &dwVal);

	pci_write_config_dword(pci_dev, 0x7c, dwVal | 0x08000000);

	udelay(5000);

	pci_read_config_dword(pci_dev, 0x7c, &dwVal);

	pci_write_config_dword(pci_dev, 0x7c, dwVal & 0xf7ffffff);

	udelay(5000);



	bVal = inb(ALI_REG(codec,ALI_SCTRL));

	bVal |= 0x02;

	outb(ALI_REG(codec,ALI_SCTRL),bVal);

	udelay(5000);

	bVal = inb(ALI_REG(codec,ALI_SCTRL));

	bVal &= 0xfd;

	outb(ALI_REG(codec,ALI_SCTRL),bVal);

	udelay(15000);



	wCount = 200;

	while (wCount--) {

		wReg = snd_ali_codec_read(codec->ac97, AC97_POWERDOWN);

		if ((wReg & 0x000f) == 0x000f)

			return 0;

		udelay(5000);

	}

	return -1;

}



#endif



/*

 *  ALI 5451 Controller

 */
@@ -561,22 +522,6 @@ static void snd_ali_disable_address_interrupt(struct snd_ali *codec) 
	outl(gc, ALI_REG(codec, ALI_GC_CIR));

}



#if 0 /* not used */

static void snd_ali_enable_voice_irq(struct snd_ali *codec,

				     unsigned int channel)

{

	unsigned int mask;

	struct snd_ali_channel_control *pchregs = &(codec->chregs);



	snd_ali_printk("enable_voice_irq channel=%d\n",channel);

	

	mask = 1 << (channel & 0x1f);

	pchregs->data.ainten  = inl(ALI_REG(codec, pchregs->regs.ainten));

	pchregs->data.ainten |= mask;

	outl(pchregs->data.ainten, ALI_REG(codec, pchregs->regs.ainten));

}

#endif



static void snd_ali_disable_voice_irq(struct snd_ali *codec,

				      unsigned int channel)

{
@@ -677,16 +622,6 @@ static void snd_ali_free_channel_pcm(struct snd_ali *codec, int channel) 
	}

}



#if 0 /* not used */

static void snd_ali_start_voice(struct snd_ali *codec, unsigned int channel)

{

	unsigned int mask = 1 << (channel & 0x1f);

	

	snd_ali_printk("start_voice: channel=%d\n",channel);

	outl(mask, ALI_REG(codec,codec->chregs.regs.start));

}

#endif



static void snd_ali_stop_voice(struct snd_ali *codec, unsigned int channel)

{

	unsigned int mask = 1 << (channel & 0x1f);