8 files changed, 16 insertions, 26 deletions

diff --git a/drivers/usb/host/ehci-grlib.c b/drivers/usb/host/ehci-grlib.c
index 5d75de9729b6..a77bd8dc33f4 100644
--- a/drivers/usb/host/ehci-grlib.c
+++ b/drivers/usb/host/ehci-grlib.c
@@ -153,9 +153,7 @@ err_irq:
 
 static int ehci_hcd_grlib_remove(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
-
-        dev_set_drvdata(&op->dev, NULL);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         dev_dbg(&op->dev, "stopping GRLIB GRUSBHC EHCI USB Controller\n");
 
@@ -171,7 +169,7 @@ static int ehci_hcd_grlib_remove(struct platform_device *op)
 
 static void ehci_hcd_grlib_shutdown(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         if (hcd->driver->shutdown)
                 hcd->driver->shutdown(hcd);
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 56dc732bf451..86da09c0f8d0 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -180,14 +180,12 @@ err_irq:
 
 static int ehci_hcd_ppc_of_remove(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
         struct ehci_hcd *ehci = hcd_to_ehci(hcd);
 
         struct device_node *np;
         struct resource res;
 
-        dev_set_drvdata(&op->dev, NULL);
-
         dev_dbg(&op->dev, "stopping PPC-OF USB Controller\n");
 
         usb_remove_hcd(hcd);
@@ -219,7 +217,7 @@ static int ehci_hcd_ppc_of_remove(struct platform_device *op)
 
 static void ehci_hcd_ppc_of_shutdown(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         if (hcd->driver->shutdown)
                 hcd->driver->shutdown(hcd);
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index d845e3bcfaff..35c7f90384a6 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -209,8 +209,7 @@ err_irq:
  */
 static int ehci_hcd_xilinx_of_remove(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
-        dev_set_drvdata(&op->dev, NULL);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         dev_dbg(&op->dev, "stopping XILINX-OF USB Controller\n");
 
@@ -229,7 +228,7 @@ static int ehci_hcd_xilinx_of_remove(struct platform_device *op)
  */
 static void ehci_hcd_xilinx_of_shutdown(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         if (hcd->driver->shutdown)
                 hcd->driver->shutdown(hcd);
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index a13709ee4e5d..3df49b169b53 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -118,7 +118,7 @@ static int of_isp1760_probe(struct platform_device *dev)
                 goto free_gpio;
         }
 
-        dev_set_drvdata(&dev->dev, drvdata);
+        platform_set_drvdata(dev, drvdata);
         return ret;
 
 free_gpio:
@@ -133,9 +133,7 @@ free_data:
 
 static int of_isp1760_remove(struct platform_device *dev)
 {
-        struct isp1760 *drvdata = dev_get_drvdata(&dev->dev);
-
-        dev_set_drvdata(&dev->dev, NULL);
+        struct isp1760 *drvdata = platform_get_drvdata(dev);
 
         usb_remove_hcd(drvdata->hcd);
         iounmap(drvdata->hcd->regs);
@@ -398,7 +396,7 @@ static int isp1760_plat_probe(struct platform_device *pdev)
                                irqflags, -ENOENT,
                                &pdev->dev, dev_name(&pdev->dev), devflags);
 
-        dev_set_drvdata(&pdev->dev, hcd);
+        platform_set_drvdata(pdev, hcd);
 
         if (IS_ERR(hcd)) {
                 pr_warning("isp1760: Failed to register the HCD device\n");
@@ -419,7 +417,7 @@ static int isp1760_plat_remove(struct platform_device *pdev)
 {
         struct resource *mem_res;
         resource_size_t mem_size;
-        struct usb_hcd *hcd = dev_get_drvdata(&pdev->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_remove_hcd(hcd);
 
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 64c2ed9ff95e..8294e2fcc2f6 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -185,8 +185,7 @@ err_rmr:
 
 static int ohci_hcd_ppc_of_remove(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
-        dev_set_drvdata(&op->dev, NULL);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         dev_dbg(&op->dev, "stopping PPC-OF USB Controller\n");
 
@@ -203,7 +202,7 @@ static int ohci_hcd_ppc_of_remove(struct platform_device *op)
 
 static void ohci_hcd_ppc_of_shutdown(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         if (hcd->driver->shutdown)
                 hcd->driver->shutdown(hcd);
diff --git a/drivers/usb/host/uhci-grlib.c b/drivers/usb/host/uhci-grlib.c
index 511bfc46dd78..53c23ff7d685 100644
--- a/drivers/usb/host/uhci-grlib.c
+++ b/drivers/usb/host/uhci-grlib.c
@@ -157,9 +157,7 @@ err_rmr:
 
 static int uhci_hcd_grlib_remove(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
-
-        dev_set_drvdata(&op->dev, NULL);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         dev_dbg(&op->dev, "stopping GRLIB GRUSBHC UHCI USB Controller\n");
 
@@ -183,7 +181,7 @@ static int uhci_hcd_grlib_remove(struct platform_device *op)
  */
 static void uhci_hcd_grlib_shutdown(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         uhci_hc_died(hcd_to_uhci(hcd));
 }
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
index e11b70ae5f6f..d033a0ec7f0d 100644
--- a/drivers/usb/host/uhci-platform.c
+++ b/drivers/usb/host/uhci-platform.c
@@ -143,7 +143,7 @@ static int uhci_hcd_platform_remove(struct platform_device *pdev)
  */
 static void uhci_hcd_platform_shutdown(struct platform_device *op)
 {
-        struct usb_hcd *hcd = dev_get_drvdata(&op->dev);
+        struct usb_hcd *hcd = platform_get_drvdata(op);
 
         uhci_hc_died(hcd_to_uhci(hcd));
 }
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index df90fe51b4aa..a3a4aa306f33 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -130,7 +130,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
                 goto unmap_registers;
 
         /* USB 2.0 roothub is stored in the platform_device now. */
-        hcd = dev_get_drvdata(&pdev->dev);
+        hcd = platform_get_drvdata(pdev);
         xhci = hcd_to_xhci(hcd);
         xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev,
                         dev_name(&pdev->dev), hcd);