aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_newemac/zmii.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/ibm_newemac/zmii.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/ibm_newemac/zmii.c')
-rw-r--r--drivers/net/ibm_newemac/zmii.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 34ed6ee8ca8a..97449e786d61 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -231,8 +231,7 @@ void *zmii_dump_regs(struct platform_device *ofdev, void *buf)
231 return regs + 1; 231 return regs + 1;
232} 232}
233 233
234static int __devinit zmii_probe(struct platform_device *ofdev, 234static int __devinit zmii_probe(struct platform_device *ofdev)
235 const struct of_device_id *match)
236{ 235{
237 struct device_node *np = ofdev->dev.of_node; 236 struct device_node *np = ofdev->dev.of_node;
238 struct zmii_instance *dev; 237 struct zmii_instance *dev;
@@ -312,7 +311,7 @@ static struct of_device_id zmii_match[] =
312 {}, 311 {},
313}; 312};
314 313
315static struct of_platform_driver zmii_driver = { 314static struct platform_driver zmii_driver = {
316 .driver = { 315 .driver = {
317 .name = "emac-zmii", 316 .name = "emac-zmii",
318 .owner = THIS_MODULE, 317 .owner = THIS_MODULE,
@@ -324,10 +323,10 @@ static struct of_platform_driver zmii_driver = {
324 323
325int __init zmii_init(void) 324int __init zmii_init(void)
326{ 325{
327 return of_register_platform_driver(&zmii_driver); 326 return platform_driver_register(&zmii_driver);
328} 327}
329 328
330void zmii_exit(void) 329void zmii_exit(void)
331{ 330{
332 of_unregister_platform_driver(&zmii_driver); 331 platform_driver_unregister(&zmii_driver);
333} 332}