Przeglądaj źródła

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: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Michael Buesch 17 lat temu
rodzic
commit
7a193a5df7

+ 2 - 2
drivers/net/wireless/b43/debugfs.c

@@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b43_wldev *dev)
 	kfree(e);
 	kfree(e);
 }
 }
 
 
+/* Called with IRQs disabled. */
 void b43_debugfs_log_txstat(struct b43_wldev *dev,
 void b43_debugfs_log_txstat(struct b43_wldev *dev,
 			    const struct b43_txstatus *status)
 			    const struct b43_txstatus *status)
 {
 {
@@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev,
 	if (!e)
 	if (!e)
 		return;
 		return;
 	log = &e->txstatlog;
 	log = &e->txstatlog;
-	B43_WARN_ON(!irqs_disabled());
-	spin_lock(&log->lock);
+	spin_lock(&log->lock); /* IRQs are already disabled. */
 	i = log->end + 1;
 	i = log->end + 1;
 	if (i == B43_NR_LOGGED_TXSTATUS)
 	if (i == B43_NR_LOGGED_TXSTATUS)
 		i = 0;
 		i = 0;

+ 3 - 2
drivers/net/wireless/b43/dma.c

@@ -1344,6 +1344,7 @@ out_unlock:
 	return err;
 	return err;
 }
 }
 
 
+/* Called with IRQs disabled. */
 void b43_dma_handle_txstatus(struct b43_wldev *dev,
 void b43_dma_handle_txstatus(struct b43_wldev *dev,
 			     const struct b43_txstatus *status)
 			     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);
 	ring = parse_cookie(dev, status->cookie, &slot);
 	if (unlikely(!ring))
 	if (unlikely(!ring))
 		return;
 		return;
-	B43_WARN_ON(!irqs_disabled());
-	spin_lock(&ring->lock);
+
+	spin_lock(&ring->lock); /* IRQs are already disabled. */
 
 
 	B43_WARN_ON(!ring->tx);
 	B43_WARN_ON(!ring->tx);
 	ops = ring->ops;
 	ops = ring->ops;

+ 0 - 2
drivers/net/wireless/b43/main.c

@@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *dev)
 {
 {
 	dev->mac_suspended--;
 	dev->mac_suspended--;
 	B43_WARN_ON(dev->mac_suspended < 0);
 	B43_WARN_ON(dev->mac_suspended < 0);
-	B43_WARN_ON(irqs_disabled());
 	if (dev->mac_suspended == 0) {
 	if (dev->mac_suspended == 0) {
 		b43_write32(dev, B43_MMIO_MACCTL,
 		b43_write32(dev, B43_MMIO_MACCTL,
 			    b43_read32(dev, B43_MMIO_MACCTL)
 			    b43_read32(dev, B43_MMIO_MACCTL)
@@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *dev)
 	u32 tmp;
 	u32 tmp;
 
 
 	might_sleep();
 	might_sleep();
-	B43_WARN_ON(irqs_disabled());
 	B43_WARN_ON(dev->mac_suspended < 0);
 	B43_WARN_ON(dev->mac_suspended < 0);
 
 
 	if (dev->mac_suspended == 0) {
 	if (dev->mac_suspended == 0) {