lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b43: avoid calling bcma_* if CONFIG_B43_BCMA is not set

Browse Source 
Avoids this:

ERROR: "bcma_chipco_pll_write" [drivers/net/wireless/b43/b43.ko] undefined!

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville
2011-12-14 09:03:52 -05:00
parent c2521653f4
commit 8b1fdb5307
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/b43/phy_n.c
View File

@@ -4048,6 +4048,7 @@ int b43_phy_initn(struct b43_wldev *dev)
/* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */ /* http://bcm-v4.sipsolutions.net/802.11/PmuSpurAvoid */
static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid) static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
{ {
#ifdef CONFIG_B43_BCMA
struct bcma_drv_cc *cc = &dev->dev->bdev->bus->drv_cc; struct bcma_drv_cc *cc = &dev->dev->bdev->bus->drv_cc;
u32 pmu_ctl; u32 pmu_ctl;
if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) { if (dev->dev->chip_id == 43224 || dev->dev->chip_id == 43225) {
@@ -4098,6 +4099,9 @@ static void b43_nphy_pmu_spur_avoid(struct b43_wldev *dev, bool avoid)
return; return;
} }
bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl); bcma_cc_set32(cc, BCMA_CC_PMU_CTL, pmu_ctl);
#else
return;
#endif
} }
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */ /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */