linux-kernel - Re: [PATCH] sound: remove checks for CONFIG_BCM_CS4297A

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <s5h4n07smkg.wl%tiwai@suse.de>
Date:	Fri, 30 May 2014 10:22:23 +0200
From:	Takashi Iwai <tiwai@...e.de>
To:	Paul Bolle <pebolle@...cali.nl>
Cc:	Jaroslav Kysela <perex@...ex.cz>, alsa-devel@...a-project.org,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] sound: remove checks for CONFIG_BCM_CS4297A_CSWARM

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 <pebolle@...cali.nl>

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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/