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

Commit 5aa57015 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Convert big if-statements to switch-statements. 



Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 70127cb6

drivers/net/wireless/rt2x00/rt2800lib.c

+26 −18
Original line number Original line Diff line number Diff line
@@ -1944,19 +1944,24 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 
		info->default_power2 = TXPOWER_A_TO_DEV(info->default_power2);

		info->default_power2 = TXPOWER_A_TO_DEV(info->default_power2);

	}

	}





	if (rt2x00_rf(rt2x00dev, RF2020) ||

	switch (rt2x00dev->chip.rf) {

	    rt2x00_rf(rt2x00dev, RF3020) ||

	case RF2020:

	    rt2x00_rf(rt2x00dev, RF3021) ||

	case RF3020:

	    rt2x00_rf(rt2x00dev, RF3022) ||

	case RF3021:

	    rt2x00_rf(rt2x00dev, RF3320))

	case RF3022:

	case RF3320:

		rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);

		rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);

	else if (rt2x00_rf(rt2x00dev, RF3052))

		break;

	case RF3052:

		rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);

		rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);

	else if (rt2x00_rf(rt2x00dev, RF5370) ||

		break;

		 rt2x00_rf(rt2x00dev, RF5390))

	case RF5370:

	case RF5390:

		rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);

		rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);

	else

		break;

	default:

		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);

		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);

	}





	/*

	/*

	 * Change BBP settings

	 * Change BBP settings
@@ -3932,15 +3937,18 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),

	rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),

			value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));

			value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));





	if (!rt2x00_rt(rt2x00dev, RT2860) &&

	switch (rt2x00dev->chip.rt) {

	    !rt2x00_rt(rt2x00dev, RT2872) &&

	case RT2860:

	    !rt2x00_rt(rt2x00dev, RT2883) &&

	case RT2872:

	    !rt2x00_rt(rt2x00dev, RT3070) &&

	case RT2883:

	    !rt2x00_rt(rt2x00dev, RT3071) &&

	case RT3070:

	    !rt2x00_rt(rt2x00dev, RT3090) &&

	case RT3071:

	    !rt2x00_rt(rt2x00dev, RT3390) &&

	case RT3090:

	    !rt2x00_rt(rt2x00dev, RT3572) &&

	case RT3390:

	    !rt2x00_rt(rt2x00dev, RT5390)) {

	case RT3572:

	case RT5390:

		break;

	default:

		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");

		ERROR(rt2x00dev, "Invalid RT chipset detected.\n");

		return -ENODEV;

		return -ENODEV;

	}

	}