Browse Source

b43: use b43_software_rfkill helper

This removes dealing with pointers directly and allows tracking radio
state with radio_on variable.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Rafał Miłecki 11 years ago
parent
commit
a6316e2896
1 changed files with 3 additions and 3 deletions
  1. 3 3
      drivers/net/wireless/b43/phy_common.c

+ 3 - 3
drivers/net/wireless/b43/phy_common.c

@@ -96,7 +96,7 @@ int b43_phy_init(struct b43_wldev *dev)
 
 
 	phy->channel = ops->get_default_chan(dev);
 	phy->channel = ops->get_default_chan(dev);
 
 
-	ops->software_rfkill(dev, false);
+	b43_software_rfkill(dev, false);
 	err = ops->init(dev);
 	err = ops->init(dev);
 	if (err) {
 	if (err) {
 		b43err(dev->wl, "PHY init failed\n");
 		b43err(dev->wl, "PHY init failed\n");
@@ -116,7 +116,7 @@ err_phy_exit:
 	if (ops->exit)
 	if (ops->exit)
 		ops->exit(dev);
 		ops->exit(dev);
 err_block_rf:
 err_block_rf:
-	ops->software_rfkill(dev, true);
+	b43_software_rfkill(dev, true);
 
 
 	return err;
 	return err;
 }
 }
@@ -125,7 +125,7 @@ void b43_phy_exit(struct b43_wldev *dev)
 {
 {
 	const struct b43_phy_operations *ops = dev->phy.ops;
 	const struct b43_phy_operations *ops = dev->phy.ops;
 
 
-	ops->software_rfkill(dev, true);
+	b43_software_rfkill(dev, true);
 	if (ops->exit)
 	if (ops->exit)
 		ops->exit(dev);
 		ops->exit(dev);
 }
 }