drivers: Remove explicit invocations of mmiowb()

[linux.git] / drivers / net / wireless / broadcom / b43 / main.c

diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c
index 74be3c809225a19570c9ce07c92088655a3f04c1..4c7980f8459121ae53ae95faa2e8cf4fc2cb3383 100644 (file)
--- a/drivers/net/wireless/broadcom/b43/main.c
+++ b/drivers/net/wireless/broadcom/b43/main.c
@@ -485,7 +485,6 @@ static void b43_ram_write(struct b43_wldev *dev, u16 offset, u32 val)
                val = swab32(val);
 
        b43_write32(dev, B43_MMIO_RAM_CONTROL, offset);
-       mmiowb();
        b43_write32(dev, B43_MMIO_RAM_DATA, val);
 }
 
@@ -656,9 +655,7 @@ static void b43_tsf_write_locked(struct b43_wldev *dev, u64 tsf)
        /* The hardware guarantees us an atomic write, if we
         * write the low register first. */
        b43_write32(dev, B43_MMIO_REV3PLUS_TSF_LOW, low);
-       mmiowb();
        b43_write32(dev, B43_MMIO_REV3PLUS_TSF_HIGH, high);
-       mmiowb();
 }
 
 void b43_tsf_write(struct b43_wldev *dev, u64 tsf)
@@ -1822,11 +1819,9 @@ static void b43_beacon_update_trigger_work(struct work_struct *work)
                if (b43_bus_host_is_sdio(dev->dev)) {
                        /* wl->mutex is enough. */
                        b43_do_beacon_update_trigger_work(dev);
-                       mmiowb();
                } else {
                        spin_lock_irq(&wl->hardirq_lock);
                        b43_do_beacon_update_trigger_work(dev);
-                       mmiowb();
                        spin_unlock_irq(&wl->hardirq_lock);
                }
        }
@@ -2078,7 +2073,6 @@ static irqreturn_t b43_interrupt_thread_handler(int irq, void *dev_id)
 
        mutex_lock(&dev->wl->mutex);
        b43_do_interrupt_thread(dev);
-       mmiowb();
        mutex_unlock(&dev->wl->mutex);
 
        return IRQ_HANDLED;
@@ -2143,7 +2137,6 @@ static irqreturn_t b43_interrupt_handler(int irq, void *dev_id)
 
        spin_lock(&dev->wl->hardirq_lock);
        ret = b43_do_interrupt(dev);
-       mmiowb();
        spin_unlock(&dev->wl->hardirq_lock);
 
        return ret;