USB: ehci-orion: the Orion EHCI root hub does have a Transaction Translator

[karo-tx-linux.git] / drivers / usb / host / ehci-au1xxx.c

diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index b1d19268cb23df9688be260794ef475bddbe0340..8b5f991e949c09371c541f18f445eb2024355b0d 100644 (file)
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -220,10 +220,9 @@ static const struct hc_driver ehci_au1xxx_hc_driver = {
         */
        .hub_status_data = ehci_hub_status_data,
        .hub_control = ehci_hub_control,
-#ifdef CONFIG_PM
-       .hub_suspend = ehci_hub_suspend,
-       .hub_resume = ehci_hub_resume,
-#endif
+       .bus_suspend = ehci_bus_suspend,
+       .bus_resume = ehci_bus_resume,
+       .relinquish_port = ehci_relinquish_port,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -238,6 +237,7 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
        if (usb_disabled())
                return -ENODEV;
 
+       /* FIXME we only want one one probe() not two */
        ret = usb_ehci_au1xxx_probe(&ehci_au1xxx_hc_driver, &hcd, pdev);
        return ret;
 }
@@ -246,6 +246,7 @@ static int ehci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
 {
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
+       /* FIXME we only want one one remove() not two */
        usb_ehci_au1xxx_remove(hcd, pdev);
        return 0;
 }
@@ -266,7 +267,7 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
        return 0;
 }
 */
-MODULE_ALIAS("au1xxx-ehci");
+MODULE_ALIAS("platform:au1xxx-ehci");
 static struct platform_driver ehci_hcd_au1xxx_driver = {
        .probe = ehci_hcd_au1xxx_drv_probe,
        .remove = ehci_hcd_au1xxx_drv_remove,
@@ -275,6 +276,5 @@ static struct platform_driver ehci_hcd_au1xxx_driver = {
        /*.resume       = ehci_hcd_au1xxx_drv_resume, */
        .driver = {
                .name = "au1xxx-ehci",
-               .bus = &platform_bus_type
        }
 };