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

Commit 6004cf29 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Kalle Valo
Browse files

b43legacy: Remove pointless cond_resched() wrapper 



cond_resched() can be used unconditionally. If CONFIG_PREEMPT is set, it
becomes a NOP scheduler wise.

Also the B43_BUG_ON() in that wrapper is a homebrewn variant of
__might_sleep() which is part of cond_resched() already.

Remove the cruft and invoke cond_resched() directly.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 654026df

drivers/net/wireless/broadcom/b43legacy/phy.c

+5 −16
Original line number Diff line number Diff line
@@ -69,17 +69,6 @@ static const s8 b43legacy_tssi2dbm_g_table[] = { 


static void b43legacy_phy_initg(struct b43legacy_wldev *dev);





static inline

void b43legacy_voluntary_preempt(void)

{

	B43legacy_BUG_ON(!(!in_atomic() && !in_irq() &&

			  !in_interrupt() && !irqs_disabled()));

#ifndef CONFIG_PREEMPT

	cond_resched();

#endif /* CONFIG_PREEMPT */

}



/* Lock the PHY registers against concurrent access from the microcode.

 * This lock is nonrecursive. */

void b43legacy_phy_lock(struct b43legacy_wldev *dev)
@@ -1124,7 +1113,7 @@ static u16 b43legacy_phy_lo_b_r15_loop(struct b43legacy_wldev *dev) 
		ret += b43legacy_phy_read(dev, 0x002C);

	}

	local_irq_restore(flags);

	b43legacy_voluntary_preempt();

	cond_resched();



	return ret;

}
@@ -1253,7 +1242,7 @@ u16 b43legacy_phy_lo_g_deviation_subval(struct b43legacy_wldev *dev, 
	}

	ret = b43legacy_phy_read(dev, 0x002D);

	local_irq_restore(flags);

	b43legacy_voluntary_preempt();

	cond_resched();



	return ret;

}
@@ -1591,7 +1580,7 @@ void b43legacy_phy_lo_g_measure(struct b43legacy_wldev *dev) 
			b43legacy_radio_write16(dev, 0x43, i);

			b43legacy_radio_write16(dev, 0x52, phy->txctl2);

			udelay(10);

			b43legacy_voluntary_preempt();

			cond_resched();



			b43legacy_phy_set_baseband_attenuation(dev, j * 2);
@@ -1642,7 +1631,7 @@ void b43legacy_phy_lo_g_measure(struct b43legacy_wldev *dev) 
					      phy->txctl2

					      | (3/*txctl1*/ << 4));

			udelay(10);

			b43legacy_voluntary_preempt();

			cond_resched();



			b43legacy_phy_set_baseband_attenuation(dev, j * 2);
@@ -1665,7 +1654,7 @@ void b43legacy_phy_lo_g_measure(struct b43legacy_wldev *dev) 
		b43legacy_phy_write(dev, 0x0812, (r27 << 8) | 0xA2);

		udelay(2);

		b43legacy_phy_write(dev, 0x0812, (r27 << 8) | 0xA3);

		b43legacy_voluntary_preempt();

		cond_resched();

	} else

		b43legacy_phy_write(dev, 0x0015, r27 | 0xEFA0);

	b43legacy_phy_lo_adjust(dev, is_initializing);