b43: use agent R/W ops for BCMA_IOCTL

BCMA_IOCTL is register in agent (AKA wrapper) core, we need to use
special R/W ops for it.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 8bcda5084dece53b110e408af1d086dee5fd8ca9..8a2e059de2350eed12fddf5f284f9499430eba70 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2814,12 +2814,12 @@ void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on)
        switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA
        case B43_BUS_BCMA:
-               tmp = bcma_read32(dev->dev->bdev, BCMA_IOCTL);
+               tmp = bcma_aread32(dev->dev->bdev, BCMA_IOCTL);
                if (on)
                        tmp |= B43_BCMA_IOCTL_MACPHYCLKEN;
                else
                        tmp &= ~B43_BCMA_IOCTL_MACPHYCLKEN;
-               bcma_write32(dev->dev->bdev, BCMA_IOCTL, tmp);
+               bcma_awrite32(dev->dev->bdev, BCMA_IOCTL, tmp);
                break;
 #endif
 #ifdef CONFIG_B43_SSB

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 95c28f584ed95844e7daf5cf4c1779d268600f9c..1ae1e84cb4d181db4de3823a11511099c80c25fd 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -611,12 +611,12 @@ static void b43_nphy_bmac_clock_fgc(struct b43_wldev *dev, bool force)
        switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA
        case B43_BUS_BCMA:
-               tmp = bcma_read32(dev->dev->bdev, BCMA_IOCTL);
+               tmp = bcma_aread32(dev->dev->bdev, BCMA_IOCTL);
                if (force)
                        tmp |= BCMA_IOCTL_FGC;
                else
                        tmp &= ~BCMA_IOCTL_FGC;
-               bcma_write32(dev->dev->bdev, BCMA_IOCTL, tmp);
+               bcma_awrite32(dev->dev->bdev, BCMA_IOCTL, tmp);
                break;
 #endif
 #ifdef CONFIG_B43_SSB