b43: trivial: include ssb word in ssb specific functions
authorRafał Miłecki <zajec5@gmail.com>
Sun, 8 May 2011 22:21:18 +0000 (00:21 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 May 2011 19:54:50 +0000 (15:54 -0400)
This can be helpful when we decide to add support for other buses.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/main.c

index 70838e825341baedccf29ed315c895c13be1ed46..f7582c096f8d647775fce4524f75570bce15b904 100644 (file)
@@ -4958,7 +4958,7 @@ out:
        return err;
 }
 
-static int b43_probe(struct ssb_device *dev, const struct ssb_device_id *id)
+static int b43_ssb_probe(struct ssb_device *dev, const struct ssb_device_id *id)
 {
        struct b43_wl *wl;
        int err;
@@ -4996,7 +4996,7 @@ static int b43_probe(struct ssb_device *dev, const struct ssb_device_id *id)
        return err;
 }
 
-static void b43_remove(struct ssb_device *dev)
+static void b43_ssb_remove(struct ssb_device *dev)
 {
        struct b43_wl *wl = ssb_get_devtypedata(dev);
        struct b43_wldev *wldev = ssb_get_drvdata(dev);
@@ -5039,8 +5039,8 @@ void b43_controller_restart(struct b43_wldev *dev, const char *reason)
 static struct ssb_driver b43_ssb_driver = {
        .name           = KBUILD_MODNAME,
        .id_table       = b43_ssb_tbl,
-       .probe          = b43_probe,
-       .remove         = b43_remove,
+       .probe          = b43_ssb_probe,
+       .remove         = b43_ssb_remove,
 };
 
 static void b43_print_driverinfo(void)