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/niu.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/niu.c')
-rw-r--r-- | drivers/net/niu.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 9fb59d3f9c92..40fa59e2fd5c 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -10062,8 +10062,7 @@ static const struct niu_ops niu_phys_ops = { | |||
10062 | .unmap_single = niu_phys_unmap_single, | 10062 | .unmap_single = niu_phys_unmap_single, |
10063 | }; | 10063 | }; |
10064 | 10064 | ||
10065 | static int __devinit niu_of_probe(struct platform_device *op, | 10065 | static int __devinit niu_of_probe(struct platform_device *op) |
10066 | const struct of_device_id *match) | ||
10067 | { | 10066 | { |
10068 | union niu_parent_id parent_id; | 10067 | union niu_parent_id parent_id; |
10069 | struct net_device *dev; | 10068 | struct net_device *dev; |
@@ -10223,7 +10222,7 @@ static const struct of_device_id niu_match[] = { | |||
10223 | }; | 10222 | }; |
10224 | MODULE_DEVICE_TABLE(of, niu_match); | 10223 | MODULE_DEVICE_TABLE(of, niu_match); |
10225 | 10224 | ||
10226 | static struct of_platform_driver niu_of_driver = { | 10225 | static struct platform_driver niu_of_driver = { |
10227 | .driver = { | 10226 | .driver = { |
10228 | .name = "niu", | 10227 | .name = "niu", |
10229 | .owner = THIS_MODULE, | 10228 | .owner = THIS_MODULE, |
@@ -10244,14 +10243,14 @@ static int __init niu_init(void) | |||
10244 | niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT); | 10243 | niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT); |
10245 | 10244 | ||
10246 | #ifdef CONFIG_SPARC64 | 10245 | #ifdef CONFIG_SPARC64 |
10247 | err = of_register_platform_driver(&niu_of_driver); | 10246 | err = platform_driver_register(&niu_of_driver); |
10248 | #endif | 10247 | #endif |
10249 | 10248 | ||
10250 | if (!err) { | 10249 | if (!err) { |
10251 | err = pci_register_driver(&niu_pci_driver); | 10250 | err = pci_register_driver(&niu_pci_driver); |
10252 | #ifdef CONFIG_SPARC64 | 10251 | #ifdef CONFIG_SPARC64 |
10253 | if (err) | 10252 | if (err) |
10254 | of_unregister_platform_driver(&niu_of_driver); | 10253 | platform_driver_unregister(&niu_of_driver); |
10255 | #endif | 10254 | #endif |
10256 | } | 10255 | } |
10257 | 10256 | ||
@@ -10262,7 +10261,7 @@ static void __exit niu_exit(void) | |||
10262 | { | 10261 | { |
10263 | pci_unregister_driver(&niu_pci_driver); | 10262 | pci_unregister_driver(&niu_pci_driver); |
10264 | #ifdef CONFIG_SPARC64 | 10263 | #ifdef CONFIG_SPARC64 |
10265 | of_unregister_platform_driver(&niu_of_driver); | 10264 | platform_driver_unregister(&niu_of_driver); |
10266 | #endif | 10265 | #endif |
10267 | } | 10266 | } |
10268 | 10267 | ||