diff options
| author | Hauke Mehrtens | 2013-03-21 16:19:45 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-03-25 21:43:41 +0100 |
| commit | 0a64baea483ce7d698f9761388e86284cf5753e3 (patch) | |
| tree | 44ea11f7f608515e454a2ca85806e2573f15aea1 /drivers/net/wireless/b43 | |
| parent | bcma: define board types (diff) | |
| download | kernel-qcow2-linux-0a64baea483ce7d698f9761388e86284cf5753e3.tar.gz kernel-qcow2-linux-0a64baea483ce7d698f9761388e86284cf5753e3.tar.xz kernel-qcow2-linux-0a64baea483ce7d698f9761388e86284cf5753e3.zip | |
b43: use bcma_chipco_gpio_control()
With this patch the same registers are written, but this access is now
protected by a lock.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index c4d0cc582555..ae4eeb3bfa54 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2780,9 +2780,7 @@ static int b43_gpio_init(struct b43_wldev *dev) switch (dev->dev->bus_type) { #ifdef CONFIG_B43_BCMA case B43_BUS_BCMA: - bcma_cc_write32(&dev->dev->bdev->bus->drv_cc, BCMA_CC_GPIOCTL, - (bcma_cc_read32(&dev->dev->bdev->bus->drv_cc, - BCMA_CC_GPIOCTL) & ~mask) | set); + bcma_chipco_gpio_control(&dev->dev->bdev->bus->drv_cc, mask, set); break; #endif #ifdef CONFIG_B43_SSB @@ -2807,8 +2805,7 @@ static void b43_gpio_cleanup(struct b43_wldev *dev) switch (dev->dev->bus_type) { #ifdef CONFIG_B43_BCMA case B43_BUS_BCMA: - bcma_cc_write32(&dev->dev->bdev->bus->drv_cc, BCMA_CC_GPIOCTL, - 0); + bcma_chipco_gpio_control(&dev->dev->bdev->bus->drv_cc, ~0, 0); break; #endif #ifdef CONFIG_B43_SSB |