Signed-off-by: Sebastian Andrzej Siewior <sebastian@xxxxxxxxxxxxx>
---
drivers/usb/host/ehci-sh.c | 53 ++-----------------------------------------
1 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index 74aed47..bc29cad 100644
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -18,7 +18,7 @@ struct ehci_sh_priv {
struct usb_hcd *hcd;
};
-static int ehci_sh_reset(struct usb_hcd *hcd)
+static int ehci_sh_reset(struct usb_hcd *hcd, void *priv)
{
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
int ret;
@@ -48,54 +48,6 @@ static int ehci_sh_reset(struct usb_hcd *hcd)
return ret;
}
-static const struct hc_driver ehci_sh_hc_driver = {
- .description = hcd_name,
- .product_desc = "SuperH EHCI",
- .hcd_priv_size = sizeof(struct ehci_hcd),
-
- /*
- * generic hardware linkage
- */
- .irq = ehci_irq,
- .flags = HCD_USB2 | HCD_MEMORY,
-
- /*
- * basic lifecycle operations
- */
- .reset = ehci_sh_reset,
- .start = ehci_run,
- .stop = ehci_stop,
- .shutdown = ehci_shutdown,
-
- /*
- * managing i/o requests and associated device resources
- */
- .urb_enqueue = ehci_urb_enqueue,
- .urb_dequeue = ehci_urb_dequeue,
- .endpoint_disable = ehci_endpoint_disable,
- .endpoint_reset = ehci_endpoint_reset,
-
- /*
- * scheduling support
- */
- .get_frame_number = ehci_get_frame,
-
- /*
- * root hub support
- */
- .hub_status_data = ehci_hub_status_data,
- .hub_control = ehci_hub_control,
-
-#ifdef CONFIG_PM
- .bus_suspend = ehci_bus_suspend,
- .bus_resume = ehci_bus_resume,
-#endif
-
- .relinquish_port = ehci_relinquish_port,
- .port_handed_over = ehci_port_handed_over,
- .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
-};
-
static int ehci_hcd_sh_probe(struct platform_device *pdev)
{
struct ehci_sh_priv *priv;
@@ -120,7 +72,8 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
clk_enable(priv->fclk);
clk_enable(priv->iclk);
- hcd = ehci_hcd_plat_probe(pdev, &ehci_sh_hc_driver);
+ hcd = ehci_hcd_plat_probe_init(pdev, &ehci_sh_hc_driver, ehci_sh_reset,
+ NULL);
if (IS_ERR(hcd)) {
ret = PTR_ERR(hcd);
goto fail_create_hcd;
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
