From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934028AbZHWRBJ (ORCPT ); Sun, 23 Aug 2009 13:01:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934002AbZHWRBI (ORCPT ); Sun, 23 Aug 2009 13:01:08 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48400 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933969AbZHWRBH (ORCPT ); Sun, 23 Aug 2009 13:01:07 -0400 Date: Sun, 23 Aug 2009 19:01:08 +0200 Message-ID: From: Takashi Iwai To: Bartlomiej Zolnierkiewicz Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ali5451: remove dead code In-Reply-To: <200908192209.55701.bzolnier@gmail.com> References: <200908192209.55701.bzolnier@gmail.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Wed, 19 Aug 2009 22:09:55 +0200, Bartlomiej Zolnierkiewicz wrote: > > From: Bartlomiej Zolnierkiewicz > Subject: [PATCH] ali5451: remove dead code > > Remove code covered by #if/endif 0 and #ifdef/endif CODEC_RESET > (CODEC_RESET is never defined). > > Signed-off-by: Bartlomiej Zolnierkiewicz Applied now. Thanks! Takashi > --- > sound/pci/ali5451/ali5451.c | 65 -------------------------------------------- > 1 file changed, 65 deletions(-) > > Index: b/sound/pci/ali5451/ali5451.c > =================================================================== > --- a/sound/pci/ali5451/ali5451.c > +++ b/sound/pci/ali5451/ali5451.c > @@ -477,45 +477,6 @@ static int snd_ali_reset_5451(struct snd > 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 > */ > @@ -560,22 +521,6 @@ static void snd_ali_disable_address_inte > 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) > { > @@ -676,16 +621,6 @@ static void snd_ali_free_channel_pcm(str > } > } > > -#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); >