aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunbmac.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-22 23:05:51 -0500
committerGrant Likely <grant.likely@secretlab.ca>2011-02-28 15:22:44 -0500
commit74888760d40b3ac9054f9c5fa07b566c0676ba2d (patch)
treeede65e8b5ad746ce6c04cbe77ceb5bbf6a6dc6fd /drivers/net/sunbmac.c
parentf07eb223a081b278be02a58394cb5fd66f1a1bbd (diff)
dt/net: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/net. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/sunbmac.c')
-rw-r--r--drivers/net/sunbmac.c9
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 */
1245static int __devinit bigmac_sbus_probe(struct platform_device *op, 1245static 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
1290MODULE_DEVICE_TABLE(of, bigmac_sbus_match); 1289MODULE_DEVICE_TABLE(of, bigmac_sbus_match);
1291 1290
1292static struct of_platform_driver bigmac_sbus_driver = { 1291static 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
1302static int __init bigmac_init(void) 1301static 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
1307static void __exit bigmac_exit(void) 1306static 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
1312module_init(bigmac_init); 1311module_init(bigmac_init);