b43: Remove irqs_disabled() sanity checks
PATCH 1/1 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 <[email protected]>
---
John, please apply to 2.6.25
drivers/net/wireless/b43/debugfs.c +2 -2
@@ -615,25 +615,25 @@ void b43_debugfs_remove_device(struct b4debugfs_remove (e->subdir);kfree (e->txstatlog.log);kfree (e); } +/* Called with IRQs disabled. */ void b43_debugfs_log_txstat (struct b43_wldev *dev,const struct b43_txstatus *status) {struct b43_dfsentry *e = dev->dfsentry;struct b43_txstatus_log *log;struct b43_txstatus *cur;int i;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 ; log->end = i; cur = &(log->log[i]);memcpy (cur, status,sizeof (*cur));
drivers/net/wireless/b43/dma.c +3 -2
@@ -1343,26 +1343,27 @@ static void b43_fill_txstatus_report(str ring->nr_succeed_tx_packets++; ring->nr_total_packet_tries += status->frame_count;#endif /* DEBUG */ } } +/* Called with IRQs disabled. */ void b43_dma_handle_txstatus (struct b43_wldev *dev,const struct b43_txstatus *status) {const struct b43_dma_ops *ops;struct b43_dmaring *ring;struct b43_dmadesc_generic *desc;struct b43_dmadesc_meta *meta;int slot; 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;while (1 ) {B43_WARN_ON (!(slot >=0 && slot < ring->nr_slots)); desc = ops->idx2desc (ring, slot, &meta);
drivers/net/wireless/b43/main.c +0 -2
@@ -2155,13 +2155,12 @@ static void b43_gpio_cleanup(struct b43_/* http://bcm-specs.sipsolutions.net/EnableMac */ static 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 ) |B43_MACCTL_ENABLED );b43_write32 (dev,B43_MMIO_GEN_IRQ_REASON ,B43_IRQ_MAC_SUSPENDED );
@@ -2181,13 +2180,12 @@ static void b43_mac_enable(struct b43_wlstatic void b43_mac_suspend (struct b43_wldev *dev) {int i;u32 tmp;might_sleep (); -B43_WARN_ON (irqs_disabled ());B43_WARN_ON (dev->mac_suspended <0 );if (dev->mac_suspended ==0 ) {/* Mask IRQs before suspending MAC. Otherwise * the MAC stays busy and won't suspend. */ spin_lock_irq (&dev->wl->irq_lock);