|
@@ -2083,7 +2083,7 @@ out:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static int __devinit b44_get_invariants(struct b44 *bp)
|
|
|
+static int b44_get_invariants(struct b44 *bp)
|
|
|
{
|
|
|
struct ssb_device *sdev = bp->sdev;
|
|
|
int err = 0;
|
|
@@ -2141,7 +2141,7 @@ static const struct net_device_ops b44_netdev_ops = {
|
|
|
#endif
|
|
|
};
|
|
|
|
|
|
-static int __devinit b44_init_one(struct ssb_device *sdev,
|
|
|
+static int b44_init_one(struct ssb_device *sdev,
|
|
|
const struct ssb_device_id *ent)
|
|
|
{
|
|
|
struct net_device *dev;
|
|
@@ -2249,7 +2249,7 @@ out:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static void __devexit b44_remove_one(struct ssb_device *sdev)
|
|
|
+static void b44_remove_one(struct ssb_device *sdev)
|
|
|
{
|
|
|
struct net_device *dev = ssb_get_drvdata(sdev);
|
|
|
|
|
@@ -2340,7 +2340,7 @@ static struct ssb_driver b44_ssb_driver = {
|
|
|
.name = DRV_MODULE_NAME,
|
|
|
.id_table = b44_ssb_tbl,
|
|
|
.probe = b44_init_one,
|
|
|
- .remove = __devexit_p(b44_remove_one),
|
|
|
+ .remove = b44_remove_one,
|
|
|
.suspend = b44_suspend,
|
|
|
.resume = b44_resume,
|
|
|
};
|