diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-05-17 18:57:28 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-19 13:54:09 -0400 |
commit | 1495298ddd496131b8226a837ab10bdd5acb3480 (patch) | |
tree | 41dcad89dd97b45cd9f410016ee0cd96283052ca | |
parent | c4a2a08165dd5a58e24eb342902839dca78887b8 (diff) | |
download | op-kernel-dev-1495298ddd496131b8226a837ab10bdd5acb3480.zip op-kernel-dev-1495298ddd496131b8226a837ab10bdd5acb3480.tar.gz |
b43: separate ssb core reset
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/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 7b3b3f7..1bc40eb 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -1143,10 +1143,9 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) } } -void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) +static void b43_ssb_wireless_core_reset(struct b43_wldev *dev, u32 flags) { u32 tmslow; - u32 macctl; flags |= B43_TMSLOW_PHYCLKEN; flags |= B43_TMSLOW_PHYRESET; @@ -1166,6 +1165,13 @@ void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) ssb_write32(dev->sdev, SSB_TMSLOW, tmslow); ssb_read32(dev->sdev, SSB_TMSLOW); /* flush */ msleep(1); +} + +void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) +{ + u32 macctl; + + b43_ssb_wireless_core_reset(dev, flags); /* Turn Analog ON, but only if we already know the PHY-type. * This protects against very early setup where we don't know the |