1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index e4c34ac386c0..0528dc4526c8 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -49,7 +49,7 @@ static const struct ehci_driver_overrides ehci_mxc_overrides __initconst = {
 
 static int ehci_mxc_drv_probe(struct platform_device *pdev)
 {
-        struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
+        struct mxc_usbh_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct usb_hcd *hcd;
         struct resource *res;
         int irq, ret;
@@ -174,7 +174,7 @@ err_alloc:
 
 static int ehci_mxc_drv_remove(struct platform_device *pdev)
 {
-        struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
+        struct mxc_usbh_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
         struct ehci_hcd *ehci = hcd_to_ehci(hcd);
         struct ehci_mxc_priv *priv = (struct ehci_mxc_priv *) ehci->priv;
@@ -184,7 +184,7 @@ static int ehci_mxc_drv_remove(struct platform_device *pdev)
         if (pdata && pdata->exit)
                 pdata->exit(pdev);
 
-        if (pdata->otg)
+        if (pdata && pdata->otg)
                 usb_phy_shutdown(pdata->otg);
 
         clk_disable_unprepare(priv->usbclk);
@@ -197,20 +197,12 @@ static int ehci_mxc_drv_remove(struct platform_device *pdev)
         return 0;
 }
 
-static void ehci_mxc_drv_shutdown(struct platform_device *pdev)
-{
-        struct usb_hcd *hcd = platform_get_drvdata(pdev);
-
-        if (hcd->driver->shutdown)
-                hcd->driver->shutdown(hcd);
-}
-
 MODULE_ALIAS("platform:mxc-ehci");
 
 static struct platform_driver ehci_mxc_driver = {
         .probe = ehci_mxc_drv_probe,
         .remove = ehci_mxc_drv_remove,
-        .shutdown = ehci_mxc_drv_shutdown,
+        .shutdown = usb_hcd_platform_shutdown,
         .driver = {
                    .name = "mxc-ehci",
         },