diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 23:05:51 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 15:22:44 -0500 |
commit | 74888760d40b3ac9054f9c5fa07b566c0676ba2d (patch) | |
tree | ede65e8b5ad746ce6c04cbe77ceb5bbf6a6dc6fd /drivers/net/xilinx_emaclite.c | |
parent | f07eb223a081b278be02a58394cb5fd66f1a1bbd (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/xilinx_emaclite.c')
-rw-r--r-- | drivers/net/xilinx_emaclite.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index cad66ce1640b..2642af4ee491 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c | |||
@@ -1101,8 +1101,7 @@ static struct net_device_ops xemaclite_netdev_ops; | |||
1101 | * Return: 0, if the driver is bound to the Emaclite device, or | 1101 | * Return: 0, if the driver is bound to the Emaclite device, or |
1102 | * a negative error if there is failure. | 1102 | * a negative error if there is failure. |
1103 | */ | 1103 | */ |
1104 | static int __devinit xemaclite_of_probe(struct platform_device *ofdev, | 1104 | static int __devinit xemaclite_of_probe(struct platform_device *ofdev) |
1105 | const struct of_device_id *match) | ||
1106 | { | 1105 | { |
1107 | struct resource r_irq; /* Interrupt resources */ | 1106 | struct resource r_irq; /* Interrupt resources */ |
1108 | struct resource r_mem; /* IO mem resources */ | 1107 | struct resource r_mem; /* IO mem resources */ |
@@ -1288,7 +1287,7 @@ static struct of_device_id xemaclite_of_match[] __devinitdata = { | |||
1288 | }; | 1287 | }; |
1289 | MODULE_DEVICE_TABLE(of, xemaclite_of_match); | 1288 | MODULE_DEVICE_TABLE(of, xemaclite_of_match); |
1290 | 1289 | ||
1291 | static struct of_platform_driver xemaclite_of_driver = { | 1290 | static struct platform_driver xemaclite_of_driver = { |
1292 | .driver = { | 1291 | .driver = { |
1293 | .name = DRIVER_NAME, | 1292 | .name = DRIVER_NAME, |
1294 | .owner = THIS_MODULE, | 1293 | .owner = THIS_MODULE, |
@@ -1306,7 +1305,7 @@ static struct of_platform_driver xemaclite_of_driver = { | |||
1306 | static int __init xemaclite_init(void) | 1305 | static int __init xemaclite_init(void) |
1307 | { | 1306 | { |
1308 | /* No kernel boot options used, we just need to register the driver */ | 1307 | /* No kernel boot options used, we just need to register the driver */ |
1309 | return of_register_platform_driver(&xemaclite_of_driver); | 1308 | return platform_driver_register(&xemaclite_of_driver); |
1310 | } | 1309 | } |
1311 | 1310 | ||
1312 | /** | 1311 | /** |
@@ -1314,7 +1313,7 @@ static int __init xemaclite_init(void) | |||
1314 | */ | 1313 | */ |
1315 | static void __exit xemaclite_cleanup(void) | 1314 | static void __exit xemaclite_cleanup(void) |
1316 | { | 1315 | { |
1317 | of_unregister_platform_driver(&xemaclite_of_driver); | 1316 | platform_driver_unregister(&xemaclite_of_driver); |
1318 | } | 1317 | } |
1319 | 1318 | ||
1320 | module_init(xemaclite_init); | 1319 | module_init(xemaclite_init); |