diff options
Diffstat (limited to 'drivers/net/sunbmac.c')
-rw-r--r-- | drivers/net/sunbmac.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 0a6a5ced3c1c..aa4765803a4c 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
@@ -1242,8 +1242,7 @@ fail_and_cleanup: | |||
1242 | /* QEC can be the parent of either QuadEthernet or a BigMAC. We want | 1242 | /* QEC can be the parent of either QuadEthernet or a BigMAC. We want |
1243 | * the latter. | 1243 | * the latter. |
1244 | */ | 1244 | */ |
1245 | static int __devinit bigmac_sbus_probe(struct platform_device *op, | 1245 | static int __devinit bigmac_sbus_probe(struct platform_device *op) |
1246 | const struct of_device_id *match) | ||
1247 | { | 1246 | { |
1248 | struct device *parent = op->dev.parent; | 1247 | struct device *parent = op->dev.parent; |
1249 | struct platform_device *qec_op; | 1248 | struct platform_device *qec_op; |
@@ -1289,7 +1288,7 @@ static const struct of_device_id bigmac_sbus_match[] = { | |||
1289 | 1288 | ||
1290 | MODULE_DEVICE_TABLE(of, bigmac_sbus_match); | 1289 | MODULE_DEVICE_TABLE(of, bigmac_sbus_match); |
1291 | 1290 | ||
1292 | static struct of_platform_driver bigmac_sbus_driver = { | 1291 | static struct platform_driver bigmac_sbus_driver = { |
1293 | .driver = { | 1292 | .driver = { |
1294 | .name = "sunbmac", | 1293 | .name = "sunbmac", |
1295 | .owner = THIS_MODULE, | 1294 | .owner = THIS_MODULE, |
@@ -1301,12 +1300,12 @@ static struct of_platform_driver bigmac_sbus_driver = { | |||
1301 | 1300 | ||
1302 | static int __init bigmac_init(void) | 1301 | static int __init bigmac_init(void) |
1303 | { | 1302 | { |
1304 | return of_register_platform_driver(&bigmac_sbus_driver); | 1303 | return platform_driver_register(&bigmac_sbus_driver); |
1305 | } | 1304 | } |
1306 | 1305 | ||
1307 | static void __exit bigmac_exit(void) | 1306 | static void __exit bigmac_exit(void) |
1308 | { | 1307 | { |
1309 | of_unregister_platform_driver(&bigmac_sbus_driver); | 1308 | platform_driver_unregister(&bigmac_sbus_driver); |
1310 | } | 1309 | } |
1311 | 1310 | ||
1312 | module_init(bigmac_init); | 1311 | module_init(bigmac_init); |