b43: use defines for board_type

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index 5ed352ddae9ed274854ed46c3faa5535d305bdff..92190dacf6895c31cfbd9748930465e4dc5a4f59 100644 (file)
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -281,8 +281,8 @@ static void lpphy_baseband_rev0_1_init(struct b43_wldev *dev)
                b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_8, 0xFFC0, 0x000A);
                b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_8, 0xC0FF, 0x0B00);
        } else if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ ||
-                 (dev->dev->board_type == 0x048A) || ((dev->phy.rev == 0) &&
-                 (sprom->boardflags_lo & B43_BFL_FEM))) {
+                  (dev->dev->board_type == SSB_BOARD_BU4312) ||
+                  (dev->phy.rev == 0 && (sprom->boardflags_lo & B43_BFL_FEM))) {
                b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_1, 0xFFC0, 0x0001);
                b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_1, 0xC0FF, 0x0400);
                b43_phy_maskset(dev, B43_LPPHY_TR_LOOKUP_2, 0xFFC0, 0x0001);

diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 5d7ea60677a4bcb5ae10c6b16bd30df0d1253ba0..7b5c2af6a2f6122dd02a0b9eb564026b36965993 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -1016,7 +1016,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
 
        if (sprom->revision < 4)
                workaround = (dev->dev->board_vendor != PCI_VENDOR_ID_BROADCOM
-                             && dev->dev->board_type == 0x46D
+                             && dev->dev->board_type == SSB_BOARD_CB2_4321
                              && dev->dev->board_rev >= 0x41);
        else
                workaround =
@@ -2616,7 +2616,7 @@ static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)
        u8 delays2[7] = { 0x8, 0x6, 0x2, 0x4, 0x4, 0x6, 0x1 };
 
        if (sprom->boardflags2_lo & B43_BFL2_SKWRKFEM_BRD ||
-           dev->dev->board_type == 0x8B) {
+           dev->dev->board_type == BCMA_BOARD_TYPE_BCM943224M93) {
                delays1[0] = 0x1;
                delays1[5] = 0x14;
        }
@@ -5002,7 +5002,7 @@ static int b43_phy_initn(struct b43_wldev *dev)
 
        if (sprom->boardflags2_lo & B43_BFL2_SKWRKFEM_BRD ||
            (dev->dev->board_vendor == PCI_VENDOR_ID_APPLE &&
-            dev->dev->board_type == 0x8B))
+            dev->dev->board_type == BCMA_BOARD_TYPE_BCM943224M93))
                b43_phy_write(dev, B43_NPHY_TXREALFD, 0xA0);
        else
                b43_phy_write(dev, B43_NPHY_TXREALFD, 0xB8);