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

Commit 55d0cc29 authored by Paul Bolle's avatar Paul Bolle Committed by Takashi Iwai
Browse files

sound: remove checks for CONFIG_BCM_CS4297A_CSWARM 



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: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 532895c5

sound/oss/swarm_cs4297a.c

+0 −4
Original line number Diff line number Diff line
@@ -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