b43: remove leftover code from old devices support

Old devices (A-PHY or B-PHY) are supposed to be supported by b43legacy.
We keep phy_a.c as it's needed for G-PHY which shares some design.

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/main.c b/drivers/net/wireless/b43/main.c
index 4b662d0abdd2cf3126c2d8eea1a6483e341429de..4164afa843e907475efcf6ee69480cb231b59ef8 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4306,15 +4306,6 @@ static int b43_phy_versioning(struct b43_wldev *dev)
        phy_type = (tmp & B43_PHYVER_TYPE) >> B43_PHYVER_TYPE_SHIFT;
        phy_rev = (tmp & B43_PHYVER_VERSION);
        switch (phy_type) {
-       case B43_PHYTYPE_A:
-               if (phy_rev >= 4)
-                       unsupported = 1;
-               break;
-       case B43_PHYTYPE_B:
-               if (phy_rev != 2 && phy_rev != 4 && phy_rev != 6
-                   && phy_rev != 7)
-                       unsupported = 1;
-               break;
        case B43_PHYTYPE_G:
                if (phy_rev > 9)
                        unsupported = 1;

diff --git a/drivers/net/wireless/b43/phy_a.h b/drivers/net/wireless/b43/phy_a.h
index 5cfaab7b16ee8c1de47bec7838aa1ab0a679f485..f7d0d929a37479ae0915655691eeb3846928d80b 100644 (file)
--- a/drivers/net/wireless/b43/phy_a.h
+++ b/drivers/net/wireless/b43/phy_a.h
@@ -123,8 +123,4 @@ struct b43_phy_a {
  */
 void b43_phy_inita(struct b43_wldev *dev);
 
-
-struct b43_phy_operations;
-extern const struct b43_phy_operations b43_phyops_a;
-
 #endif /* LINUX_B43_PHY_A_H_ */

diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 2d05b5987168c92dec99f3fddebd87bb47b0aaca..ce486eeaf8e1480cd2b2c1b9b53ebfc3590ed1bc 100644 (file)
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -45,9 +45,6 @@ int b43_phy_allocate(struct b43_wldev *dev)
        phy->ops = NULL;
 
        switch (phy->type) {
-       case B43_PHYTYPE_A:
-               phy->ops = &b43_phyops_a;
-               break;
        case B43_PHYTYPE_G:
                phy->ops = &b43_phyops_g;
                break;