diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-24 17:14:37 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:57:52 -0400 |
commit | 1ab1d63a85cee2545272f63a7644e9f855cb65d0 (patch) | |
tree | 089afe8c03370cdfaf3eeb30d09e1bcac8a67898 /drivers/net/niu.c | |
parent | eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f (diff) |
of/platform: remove all of_bus_type and of_platform_bus_type references
Both of_bus_type and of_platform_bus_type are just #define aliases
for the platform bus. This patch removes all references to them and
switches to the of_register_platform_driver()/of_unregister_platform_driver()
API for registering.
Subsequent patches will convert each user of of_register_platform_driver()
into plain platform_drivers without the of_platform_driver shim. At which
point the of_register_platform_driver()/of_unregister_platform_driver()
functions can be removed.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index f6ecf6180f72..8cb2b30eccae 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -10251,14 +10251,14 @@ static int __init niu_init(void) | |||
10251 | niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT); | 10251 | niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT); |
10252 | 10252 | ||
10253 | #ifdef CONFIG_SPARC64 | 10253 | #ifdef CONFIG_SPARC64 |
10254 | err = of_register_driver(&niu_of_driver, &of_bus_type); | 10254 | err = of_register_platform_driver(&niu_of_driver); |
10255 | #endif | 10255 | #endif |
10256 | 10256 | ||
10257 | if (!err) { | 10257 | if (!err) { |
10258 | err = pci_register_driver(&niu_pci_driver); | 10258 | err = pci_register_driver(&niu_pci_driver); |
10259 | #ifdef CONFIG_SPARC64 | 10259 | #ifdef CONFIG_SPARC64 |
10260 | if (err) | 10260 | if (err) |
10261 | of_unregister_driver(&niu_of_driver); | 10261 | of_unregister_platform_driver(&niu_of_driver); |
10262 | #endif | 10262 | #endif |
10263 | } | 10263 | } |
10264 | 10264 | ||
@@ -10269,7 +10269,7 @@ static void __exit niu_exit(void) | |||
10269 | { | 10269 | { |
10270 | pci_unregister_driver(&niu_pci_driver); | 10270 | pci_unregister_driver(&niu_pci_driver); |
10271 | #ifdef CONFIG_SPARC64 | 10271 | #ifdef CONFIG_SPARC64 |
10272 | of_unregister_driver(&niu_of_driver); | 10272 | of_unregister_platform_driver(&niu_of_driver); |
10273 | #endif | 10273 | #endif |
10274 | } | 10274 | } |
10275 | 10275 | ||