b43: use b43_software_rfkill helper
authorRafał Miłecki <zajec5@gmail.com>
Tue, 22 Apr 2014 11:54:36 +0000 (13:54 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Apr 2014 16:05:10 +0000 (12:05 -0400)
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>
drivers/net/wireless/b43/phy_common.c

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