Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36677874 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

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: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 02c5172c

drivers/net/wireless/b43/main.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/b43/phy_n.c

+2 −2
Original line number Diff line number Diff line
@@ -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