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>

diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index c3024ecea38a71c5e6edcc85979ede1ad936c22f..078e6f3477a9dfb3aa9a1fd67c7cb0fd4c8fa8cb 100644 (file)
--- 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 7416c5e9154d6a734ece86a5d071ca57f7be485a..3719a8884c1e010a5178ab490402638a63d5c456 100644 (file)
--- 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);