From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932573AbaE3IW1 (ORCPT ); Fri, 30 May 2014 04:22:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58704 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932303AbaE3IWZ (ORCPT ); Fri, 30 May 2014 04:22:25 -0400 Date: Fri, 30 May 2014 10:22:23 +0200 Message-ID: From: Takashi Iwai To: Paul Bolle Cc: Jaroslav Kysela , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] sound: remove checks for CONFIG_BCM_CS4297A_CSWARM In-Reply-To: <1401382304.25908.5.camel@x220> References: <1401382304.25908.5.camel@x220> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3 (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 Thu, 29 May 2014 18:51:44 +0200, Paul Bolle wrote: > > Checks for CONFIG_BCM_CS4297A_CSWARM were added in v2.6.11. The related > Kconfig symbol was never added so these checks always evaluated to true. > Remove them. > > Signed-off-by: Paul Bolle Thanks, applied. Takashi > --- > Untested. > > sound/oss/swarm_cs4297a.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c > index f851fd0e199c..a33e8ce8085b 100644 > --- a/sound/oss/swarm_cs4297a.c > +++ b/sound/oss/swarm_cs4297a.c > @@ -2625,15 +2625,12 @@ static int __init cs4297a_init(void) > u32 pwr, id; > mm_segment_t fs; > int rval; > -#ifndef CONFIG_BCM_CS4297A_CSWARM > u64 cfg; > int mdio_val; > -#endif > > CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO > "cs4297a: cs4297a_init_module()+ \n")); > > -#ifndef CONFIG_BCM_CS4297A_CSWARM > mdio_val = __raw_readq(KSEG1 + A_MAC_REGISTER(2, R_MAC_MDIO)) & > (M_MAC_MDIO_DIR|M_MAC_MDIO_OUT); > > @@ -2659,7 +2656,6 @@ static int __init cs4297a_init(void) > __raw_writeq(mdio_val | M_MAC_GENC, KSEG1+A_MAC_REGISTER(2, R_MAC_MDIO)); > /* Give the codec some time to finish resetting (start the bit clock) */ > udelay(100); > -#endif > > if (!(s = kzalloc(sizeof(struct cs4297a_state), GFP_KERNEL))) { > CS_DBGOUT(CS_ERROR, 1, printk(KERN_ERR > -- > 1.9.3 >