Commit 358623c2 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Simplify rt2x00_check_rev 



rt2x00_check_rev() was too specific for rt2500usb and rt73usb,
by adding the mask argument (instead of hardcoding it into
the function itself) we can use the function in rt2800usb as
well.

v2: Fix revision mask for rt2800usb

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6cfe62cd

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1559,7 +1559,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	rt2500usb_register_read(rt2x00dev, MAC_CSR0, &reg);

	rt2x00_set_chip(rt2x00dev, RT2570, value, reg);



	if (!rt2x00_check_rev(&rt2x00dev->chip, 0)) {

	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0)) {

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

		return -ENODEV;

	}

drivers/net/wireless/rt2x00/rt2800usb.c

+4 −3
Original line number Diff line number Diff line
@@ -2348,9 +2348,10 @@ static int rt2800usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * The check for rt2860 is not a typo, some rt2870 hardware

	 * identifies itself as rt2860 in the CSR register.

	 */

	if ((rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2860) &&

	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2870) &&

	    (rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x3070)) {

	if (!rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28600000) &&

	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28700000) &&

	    !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28800000) &&

	    !rt2x00_check_rev(&rt2x00dev->chip, 0xffff0000, 0x30700000)) {

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

		return -ENODEV;

	}

drivers/net/wireless/rt2x00/rt2x00.h

+3 −4
Original line number Diff line number Diff line
@@ -915,11 +915,10 @@ static inline u32 rt2x00_rev(const struct rt2x00_chip *chipset) 
	return chipset->rev;

}



static inline u16 rt2x00_check_rev(const struct rt2x00_chip *chipset,

				   const u32 rev)

static inline bool rt2x00_check_rev(const struct rt2x00_chip *chipset,

				    const u32 mask, const u32 rev)

{

	return (((chipset->rev & 0xffff0) == rev) &&

		!!(chipset->rev & 0x0000f));

	return ((chipset->rev & mask) == rev);

}



/**

drivers/net/wireless/rt2x00/rt73usb.c

+2 −1
Original line number Diff line number Diff line
@@ -1846,7 +1846,8 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	rt2x00usb_register_read(rt2x00dev, MAC_CSR0, &reg);

	rt2x00_set_chip(rt2x00dev, RT2571, value, reg);



	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x25730)) {

	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0x25730) ||

	    !rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) {

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

		return -ENODEV;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE