git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
b43
/
rfkill.c
diff --git
a/drivers/net/wireless/b43/rfkill.c
b/drivers/net/wireless/b43/rfkill.c
index
a617efe
..
59c3afe
100644
(file)
--- a/
drivers/net/wireless/b43/rfkill.c
+++ b/
drivers/net/wireless/b43/rfkill.c
@@
-37,17
+37,16
@@
void b43_rfkill_poll(struct ieee80211_hw *hw)
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
{
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
- struct ssb_bus *bus = dev->sdev->bus;
bool enabled;
bool brought_up = false;
mutex_lock(&wl->mutex);
if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) {
bool enabled;
bool brought_up = false;
mutex_lock(&wl->mutex);
if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) {
- if (
ssb_bus_powerup(bus
, 0)) {
+ if (
b43_bus_powerup(dev
, 0)) {
mutex_unlock(&wl->mutex);
return;
}
mutex_unlock(&wl->mutex);
return;
}
-
ssb_device_enable(dev->s
dev, 0);
+
b43_device_enable(
dev, 0);
brought_up = true;
}
brought_up = true;
}
@@
-63,8
+62,8
@@
void b43_rfkill_poll(struct ieee80211_hw *hw)
}
if (brought_up) {
}
if (brought_up) {
-
ssb_device_disable(dev->s
dev, 0);
-
ssb_bus_may_powerdown(bus
);
+
b43_device_disable(
dev, 0);
+
b43_bus_may_powerdown(dev
);
}
mutex_unlock(&wl->mutex);
}
mutex_unlock(&wl->mutex);