diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2013-03-04 16:39:10 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-06 16:28:59 -0500 |
| commit | 7c2332b8061b7d4d7cd539ced1277e78d976f3da (patch) | |
| tree | b17e8dd9acb9e4df6b38bd30fd6d5b5cefe7c796 | |
| parent | ef95e58deffef56076890383cc8a4b199612e758 (diff) | |
b43: HT-PHY: make it BCMA-only
HT-PHY was found only on BCM4331 which is a BCMA-based chipset. This is
reallly unlikely we will ever see HT-PHY on SSB thus make the whole code
BCMA specific. This will allow us to call various BCMA-specific
functions directly (without extra checks).
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/b43/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/b43/phy_ht.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index c3024ecea38..078e6f3477a 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig @@ -131,7 +131,7 @@ config B43_PHY_LP config B43_PHY_HT bool "Support for HT-PHY (high throughput) devices" - depends on B43 + depends on B43 && B43_BCMA ---help--- Support for the HT-PHY. diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c index 7416c5e9154..3719a8884c1 100644 --- a/drivers/net/wireless/b43/phy_ht.c +++ b/drivers/net/wireless/b43/phy_ht.c @@ -346,6 +346,11 @@ static int b43_phy_ht_op_init(struct b43_wldev *dev) u16 tmp; u16 clip_state[3]; + if (dev->dev->bus_type != B43_BUS_BCMA) { + b43err(dev->wl, "HT-PHY is supported only on BCMA bus!\n"); + return -EOPNOTSUPP; + } + b43_phy_ht_tables_init(dev); b43_phy_mask(dev, 0x0be, ~0x2); |