b43: N-PHY: drop unused definition, uncomment needed call

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/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index a0e8283519fdb740d2739c2888d93c2f3e8ebd29..4a817e3da163c73b79d8194c8c6f4293c348ed0c 100644 (file)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -222,12 +222,6 @@ void b43_nphy_radio_turn_off(struct b43_wldev *dev)
                     ~B43_NPHY_RFCTL_CMD_EN);
 }
 
-#define ntab_upload(dev, offset, data) do { \
-               unsigned int i;                                         \
-               for (i = 0; i < (offset##_SIZE); i++)                   \
-                       b43_ntab_write(dev, (offset) + i, (data)[i]);   \
-       } while (0)
-
 /*
  * Upload the N-PHY tables.
  * http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables
@@ -2021,11 +2015,11 @@ int b43_phy_initn(struct b43_wldev *dev)
        b43_nphy_workarounds(dev);
 
        /* Reset CCA, in init code it differs a little from standard way */
-       /* b43_nphy_bmac_clock_fgc(dev, 1); */
+       b43_nphy_bmac_clock_fgc(dev, 1);
        tmp = b43_phy_read(dev, B43_NPHY_BBCFG);
        b43_phy_write(dev, B43_NPHY_BBCFG, tmp | B43_NPHY_BBCFG_RSTCCA);
        b43_phy_write(dev, B43_NPHY_BBCFG, tmp & ~B43_NPHY_BBCFG_RSTCCA);
-       /* b43_nphy_bmac_clock_fgc(dev, 0); */
+       b43_nphy_bmac_clock_fgc(dev, 0);
 
        /* TODO N PHY MAC PHY Clock Set with argument 1 */