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

Commit 7a193a5d authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43: Remove irqs_disabled() sanity checks 



Remove all irqs_disabled() sanity checks, as they are not safe on
a RT-enabled kernel and will trigger bogus warnings.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ffa9256a

drivers/net/wireless/b43/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b43_wldev *dev) 
	kfree(e);

}



/* Called with IRQs disabled. */

void b43_debugfs_log_txstat(struct b43_wldev *dev,

			    const struct b43_txstatus *status)

{
@@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev, 
	if (!e)

		return;

	log = &e->txstatlog;

	B43_WARN_ON(!irqs_disabled());

	spin_lock(&log->lock);

	spin_lock(&log->lock); /* IRQs are already disabled. */

	i = log->end + 1;

	if (i == B43_NR_LOGGED_TXSTATUS)

		i = 0;

drivers/net/wireless/b43/dma.c

+3 −2
Original line number Diff line number Diff line
@@ -1344,6 +1344,7 @@ int b43_dma_tx(struct b43_wldev *dev, 
	return err;

}



/* Called with IRQs disabled. */

void b43_dma_handle_txstatus(struct b43_wldev *dev,

			     const struct b43_txstatus *status)

{
@@ -1356,8 +1357,8 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev, 
	ring = parse_cookie(dev, status->cookie, &slot);

	if (unlikely(!ring))

		return;

	B43_WARN_ON(!irqs_disabled());

	spin_lock(&ring->lock);



	spin_lock(&ring->lock); /* IRQs are already disabled. */



	B43_WARN_ON(!ring->tx);

	ops = ring->ops;

drivers/net/wireless/b43/main.c

+0 −2
Original line number Diff line number Diff line
@@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *dev) 
{

	dev->mac_suspended--;

	B43_WARN_ON(dev->mac_suspended < 0);

	B43_WARN_ON(irqs_disabled());

	if (dev->mac_suspended == 0) {

		b43_write32(dev, B43_MMIO_MACCTL,

			    b43_read32(dev, B43_MMIO_MACCTL)
@@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *dev) 
	u32 tmp;



	might_sleep();

	B43_WARN_ON(irqs_disabled());

	B43_WARN_ON(dev->mac_suspended < 0);



	if (dev->mac_suspended == 0) {