diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 23:08:34 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 15:22:45 -0500 |
commit | d35fb6417655ebf6de93e2135dc386c3c470f545 (patch) | |
tree | 23eade825b224e48ab300017395ddd92db837da0 /drivers/usb/host/ehci-hcd.c | |
parent | 28541d0f1894cd0c8f4a90c6e006c88d38ad3ac0 (diff) |
dt/usb: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/usb. 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/usb/host/ehci-hcd.c')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 74dcf49bd015..c4de2d75a3d7 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -1306,24 +1306,24 @@ static int __init ehci_hcd_init(void) | |||
1306 | #endif | 1306 | #endif |
1307 | 1307 | ||
1308 | #ifdef OF_PLATFORM_DRIVER | 1308 | #ifdef OF_PLATFORM_DRIVER |
1309 | retval = of_register_platform_driver(&OF_PLATFORM_DRIVER); | 1309 | retval = platform_driver_register(&OF_PLATFORM_DRIVER); |
1310 | if (retval < 0) | 1310 | if (retval < 0) |
1311 | goto clean3; | 1311 | goto clean3; |
1312 | #endif | 1312 | #endif |
1313 | 1313 | ||
1314 | #ifdef XILINX_OF_PLATFORM_DRIVER | 1314 | #ifdef XILINX_OF_PLATFORM_DRIVER |
1315 | retval = of_register_platform_driver(&XILINX_OF_PLATFORM_DRIVER); | 1315 | retval = platform_driver_register(&XILINX_OF_PLATFORM_DRIVER); |
1316 | if (retval < 0) | 1316 | if (retval < 0) |
1317 | goto clean4; | 1317 | goto clean4; |
1318 | #endif | 1318 | #endif |
1319 | return retval; | 1319 | return retval; |
1320 | 1320 | ||
1321 | #ifdef XILINX_OF_PLATFORM_DRIVER | 1321 | #ifdef XILINX_OF_PLATFORM_DRIVER |
1322 | /* of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); */ | 1322 | /* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */ |
1323 | clean4: | 1323 | clean4: |
1324 | #endif | 1324 | #endif |
1325 | #ifdef OF_PLATFORM_DRIVER | 1325 | #ifdef OF_PLATFORM_DRIVER |
1326 | of_unregister_platform_driver(&OF_PLATFORM_DRIVER); | 1326 | platform_driver_unregister(&OF_PLATFORM_DRIVER); |
1327 | clean3: | 1327 | clean3: |
1328 | #endif | 1328 | #endif |
1329 | #ifdef PS3_SYSTEM_BUS_DRIVER | 1329 | #ifdef PS3_SYSTEM_BUS_DRIVER |
@@ -1351,10 +1351,10 @@ module_init(ehci_hcd_init); | |||
1351 | static void __exit ehci_hcd_cleanup(void) | 1351 | static void __exit ehci_hcd_cleanup(void) |
1352 | { | 1352 | { |
1353 | #ifdef XILINX_OF_PLATFORM_DRIVER | 1353 | #ifdef XILINX_OF_PLATFORM_DRIVER |
1354 | of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); | 1354 | platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); |
1355 | #endif | 1355 | #endif |
1356 | #ifdef OF_PLATFORM_DRIVER | 1356 | #ifdef OF_PLATFORM_DRIVER |
1357 | of_unregister_platform_driver(&OF_PLATFORM_DRIVER); | 1357 | platform_driver_unregister(&OF_PLATFORM_DRIVER); |
1358 | #endif | 1358 | #endif |
1359 | #ifdef PLATFORM_DRIVER | 1359 | #ifdef PLATFORM_DRIVER |
1360 | platform_driver_unregister(&PLATFORM_DRIVER); | 1360 | platform_driver_unregister(&PLATFORM_DRIVER); |