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

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

rt2x00: Clean up use of rt2x00_intf_is_pci. 



RT chipsets are unique across both PCI and USB busses, and don't overlap.
Therefore there is no need to test for bus type when only checking for
chipset type. Remove the redundant checks.

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 6a6f455c

drivers/net/wireless/rt2x00/rt2800lib.c

+7 −10
Original line number Original line Diff line number Diff line
@@ -217,14 +217,12 @@ void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev, 
{

{

	u32 reg;

	u32 reg;





	if (rt2x00_intf_is_pci(rt2x00dev)) {

	/*

	/*

	 * RT2880 and RT3052 don't support MCU requests.

	 * RT2880 and RT3052 don't support MCU requests.

	 */

	 */

	if (rt2x00_rt(&rt2x00dev->chip, RT2880) ||

	if (rt2x00_rt(&rt2x00dev->chip, RT2880) ||

	    rt2x00_rt(&rt2x00dev->chip, RT3052))

	    rt2x00_rt(&rt2x00dev->chip, RT3052))

		return;

		return;

	}





	mutex_lock(&rt2x00dev->csr_mutex);

	mutex_lock(&rt2x00dev->csr_mutex);
@@ -1482,8 +1480,7 @@ int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev) 
		rt2800_bbp_write(rt2x00dev, 105, 0x05);

		rt2800_bbp_write(rt2x00dev, 105, 0x05);

	}

	}





	if (rt2x00_intf_is_pci(rt2x00dev) &&

	if (rt2x00_rt(&rt2x00dev->chip, RT3052)) {

	    rt2x00_rt(&rt2x00dev->chip, RT3052)) {

		rt2800_bbp_write(rt2x00dev, 31, 0x08);

		rt2800_bbp_write(rt2x00dev, 31, 0x08);

		rt2800_bbp_write(rt2x00dev, 78, 0x0e);

		rt2800_bbp_write(rt2x00dev, 78, 0x0e);

		rt2800_bbp_write(rt2x00dev, 80, 0x08);

		rt2800_bbp_write(rt2x00dev, 80, 0x08);