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/isp1760-if.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/isp1760-if.c')
-rw-r--r-- | drivers/usb/host/isp1760-if.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index 3b28dbfca058..7ee30056f373 100644 --- a/drivers/usb/host/isp1760-if.c +++ b/drivers/usb/host/isp1760-if.c | |||
@@ -27,8 +27,7 @@ | |||
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #ifdef CONFIG_PPC_OF | 29 | #ifdef CONFIG_PPC_OF |
30 | static int of_isp1760_probe(struct platform_device *dev, | 30 | static int of_isp1760_probe(struct platform_device *dev) |
31 | const struct of_device_id *match) | ||
32 | { | 31 | { |
33 | struct usb_hcd *hcd; | 32 | struct usb_hcd *hcd; |
34 | struct device_node *dp = dev->dev.of_node; | 33 | struct device_node *dp = dev->dev.of_node; |
@@ -119,7 +118,7 @@ static const struct of_device_id of_isp1760_match[] = { | |||
119 | }; | 118 | }; |
120 | MODULE_DEVICE_TABLE(of, of_isp1760_match); | 119 | MODULE_DEVICE_TABLE(of, of_isp1760_match); |
121 | 120 | ||
122 | static struct of_platform_driver isp1760_of_driver = { | 121 | static struct platform_driver isp1760_of_driver = { |
123 | .driver = { | 122 | .driver = { |
124 | .name = "nxp-isp1760", | 123 | .name = "nxp-isp1760", |
125 | .owner = THIS_MODULE, | 124 | .owner = THIS_MODULE, |
@@ -398,7 +397,7 @@ static int __init isp1760_init(void) | |||
398 | if (!ret) | 397 | if (!ret) |
399 | any_ret = 0; | 398 | any_ret = 0; |
400 | #ifdef CONFIG_PPC_OF | 399 | #ifdef CONFIG_PPC_OF |
401 | ret = of_register_platform_driver(&isp1760_of_driver); | 400 | ret = platform_driver_register(&isp1760_of_driver); |
402 | if (!ret) | 401 | if (!ret) |
403 | any_ret = 0; | 402 | any_ret = 0; |
404 | #endif | 403 | #endif |
@@ -418,7 +417,7 @@ static void __exit isp1760_exit(void) | |||
418 | { | 417 | { |
419 | platform_driver_unregister(&isp1760_plat_driver); | 418 | platform_driver_unregister(&isp1760_plat_driver); |
420 | #ifdef CONFIG_PPC_OF | 419 | #ifdef CONFIG_PPC_OF |
421 | of_unregister_platform_driver(&isp1760_of_driver); | 420 | platform_driver_unregister(&isp1760_of_driver); |
422 | #endif | 421 | #endif |
423 | #ifdef CONFIG_PCI | 422 | #ifdef CONFIG_PCI |
424 | pci_unregister_driver(&isp1761_pci_driver); | 423 | pci_unregister_driver(&isp1761_pci_driver); |