mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
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>
This commit is contained in:
parent
ffa9256aaa
commit
7a193a5df7
3 changed files with 5 additions and 6 deletions
|
@ -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); /* IRQs are already disabled. */
|
||||||
spin_lock(&log->lock);
|
|
||||||
i = log->end + 1;
|
i = log->end + 1;
|
||||||
if (i == B43_NR_LOGGED_TXSTATUS)
|
if (i == B43_NR_LOGGED_TXSTATUS)
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
|
@ -1344,6 +1344,7 @@ int b43_dma_tx(struct b43_wldev *dev,
|
||||||
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;
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue