[PATCH] USB: cleanups for ohci-s3c2410.c

[safe/jmp/linux-2.6] / drivers / usb / host / ohci-lh7a404.c

diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index 238fa4a..0020ed7 100644 (file)
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -16,6 +16,9 @@
  * This file is licenced under the GPL.
  */
 
+#include <linux/platform_device.h>
+#include <linux/signal.h>
+
 #include <asm/hardware.h>
 
 
@@ -202,9 +205,8 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-static int ohci_hcd_lh7a404_drv_probe(struct device *dev)
+static int ohci_hcd_lh7a404_drv_probe(struct platform_device *pdev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
        int ret;
 
        pr_debug ("In ohci_hcd_lh7a404_drv_probe");
@@ -216,40 +218,38 @@ static int ohci_hcd_lh7a404_drv_probe(struct device *dev)
        return ret;
 }
 
-static int ohci_hcd_lh7a404_drv_remove(struct device *dev)
+static int ohci_hcd_lh7a404_drv_remove(struct platform_device *pdev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct usb_hcd *hcd = dev_get_drvdata(dev);
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
        usb_hcd_lh7a404_remove(hcd, pdev);
        return 0;
 }
        /*TBD*/
-/*static int ohci_hcd_lh7a404_drv_suspend(struct device *dev)
+/*static int ohci_hcd_lh7a404_drv_suspend(struct platform_device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct usb_hcd *hcd = dev_get_drvdata(dev);
+       struct usb_hcd *hcd = platform_get_drvdata(dev);
 
        return 0;
 }
-static int ohci_hcd_lh7a404_drv_resume(struct device *dev)
+static int ohci_hcd_lh7a404_drv_resume(struct platform_device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct usb_hcd *hcd = dev_get_drvdata(dev);
+       struct usb_hcd *hcd = platform_get_drvdata(dev);
 
 
        return 0;
 }
 */
 
-static struct device_driver ohci_hcd_lh7a404_driver = {
-       .name           = "lh7a404-ohci",
-       .owner          = THIS_MODULE,
-       .bus            = &platform_bus_type,
+static struct platform_driver ohci_hcd_lh7a404_driver = {
        .probe          = ohci_hcd_lh7a404_drv_probe,
        .remove         = ohci_hcd_lh7a404_drv_remove,
        /*.suspend      = ohci_hcd_lh7a404_drv_suspend, */
        /*.resume       = ohci_hcd_lh7a404_drv_resume, */
+       .driver         = {
+               .name   = "lh7a404-ohci",
+               .owner  = THIS_MODULE,
+       },
 };
 
 static int __init ohci_hcd_lh7a404_init (void)
@@ -258,12 +258,12 @@ static int __init ohci_hcd_lh7a404_init (void)
        pr_debug ("block sizes: ed %d td %d\n",
                sizeof (struct ed), sizeof (struct td));
 
-       return driver_register(&ohci_hcd_lh7a404_driver);
+       return platform_driver_register(&ohci_hcd_lh7a404_driver);
 }
 
 static void __exit ohci_hcd_lh7a404_cleanup (void)
 {
-       driver_unregister(&ohci_hcd_lh7a404_driver);
+       platform_driver_unregister(&ohci_hcd_lh7a404_driver);
 }
 
 module_init (ohci_hcd_lh7a404_init);