6 files changed, 32 insertions, 30 deletions

diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 3537d51073b2..2928523268b5 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2768,8 +2768,11 @@ static const struct of_device_id qe_udc_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, qe_udc_match);
 
 static struct of_platform_driver udc_driver = {
-        .name           = (char *)driver_name,
-        .match_table    = qe_udc_match,
+        .driver = {
+                .name = (char *)driver_name,
+                .owner = THIS_MODULE,
+                .of_match_table = qe_udc_match,
+        },
         .probe          = qe_udc_probe,
         .remove         = __devexit_p(qe_udc_remove),
 #ifdef CONFIG_PM
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 8df33b8a634c..5aec92866ab3 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -108,7 +108,7 @@ ppc44x_enable_bmt(struct device_node *dn)
 static int __devinit
 ehci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dn = op->node;
+        struct device_node *dn = op->dev.of_node;
         struct usb_hcd *hcd;
         struct ehci_hcd *ehci = NULL;
         struct resource res;
@@ -274,13 +274,12 @@ MODULE_DEVICE_TABLE(of, ehci_hcd_ppc_of_match);
 
 
 static struct of_platform_driver ehci_hcd_ppc_of_driver = {
-        .name           = "ppc-of-ehci",
-        .match_table    = ehci_hcd_ppc_of_match,
         .probe          = ehci_hcd_ppc_of_probe,
         .remove         = ehci_hcd_ppc_of_remove,
         .shutdown       = ehci_hcd_ppc_of_shutdown,
-        .driver         = {
-                .name   = "ppc-of-ehci",
-                .owner  = THIS_MODULE,
+        .driver = {
+                .name = "ppc-of-ehci",
+                .owner = THIS_MODULE,
+                .of_match_table = ehci_hcd_ppc_of_match,
         },
 };
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index f603bb2c0a8e..013972bbde57 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -288,13 +288,12 @@ static const struct of_device_id ehci_hcd_xilinx_of_match[] = {
 MODULE_DEVICE_TABLE(of, ehci_hcd_xilinx_of_match);
 
 static struct of_platform_driver ehci_hcd_xilinx_of_driver = {
-        .name           = "xilinx-of-ehci",
-        .match_table    = ehci_hcd_xilinx_of_match,
         .probe          = ehci_hcd_xilinx_of_probe,
         .remove         = ehci_hcd_xilinx_of_remove,
         .shutdown       = ehci_hcd_xilinx_of_shutdown,
-        .driver         = {
-                .name   = "xilinx-of-ehci",
-                .owner  = THIS_MODULE,
+        .driver = {
+                .name = "xilinx-of-ehci",
+                .owner = THIS_MODULE,
+                .of_match_table = ehci_hcd_xilinx_of_match,
         },
 };
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 90453379a434..c7c8392a88b9 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -565,7 +565,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev,
                                    const struct of_device_id *ofid)
 {
         struct device *dev = &ofdev->dev;
-        struct device_node *node = ofdev->node;
+        struct device_node *node = dev->of_node;
         struct usb_hcd *hcd;
         struct fhci_hcd *fhci;
         struct resource usb_regs;
@@ -670,7 +670,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev,
         }
 
         for (j = 0; j < NUM_PINS; j++) {
-                fhci->pins[j] = qe_pin_request(ofdev->node, j);
+                fhci->pins[j] = qe_pin_request(node, j);
                 if (IS_ERR(fhci->pins[j])) {
                         ret = PTR_ERR(fhci->pins[j]);
                         dev_err(dev, "can't get pin %d: %d\n", j, ret);
@@ -813,8 +813,11 @@ static const struct of_device_id of_fhci_match[] = {
 MODULE_DEVICE_TABLE(of, of_fhci_match);
 
 static struct of_platform_driver of_fhci_driver = {
-        .name           = "fsl,usb-fhci",
-        .match_table    = of_fhci_match,
+        .driver = {
+                .name = "fsl,usb-fhci",
+                .owner = THIS_MODULE,
+                .of_match_table = of_fhci_match,
+        },
         .probe          = of_fhci_probe,
         .remove         = __devexit_p(of_fhci_remove),
 };
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 8f0259eaa2c7..ec85d0c3cc3e 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -31,7 +31,7 @@ static int of_isp1760_probe(struct of_device *dev,
                 const struct of_device_id *match)
 {
         struct usb_hcd *hcd;
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
         struct resource *res;
         struct resource memory;
         struct of_irq oirq;
@@ -120,8 +120,11 @@ static const struct of_device_id of_isp1760_match[] = {
 MODULE_DEVICE_TABLE(of, of_isp1760_match);
 
 static struct of_platform_driver isp1760_of_driver = {
-        .name           = "nxp-isp1760",
-        .match_table    = of_isp1760_match,
+        .driver = {
+                .name = "nxp-isp1760",
+                .owner = THIS_MODULE,
+                .of_match_table = of_isp1760_match,
+        },
         .probe          = of_isp1760_probe,
         .remove         = of_isp1760_remove,
 };
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 103263c230cf..df165917412a 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -83,7 +83,7 @@ static const struct hc_driver ohci_ppc_of_hc_driver = {
 static int __devinit
 ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dn = op->node;
+        struct device_node *dn = op->dev.of_node;
         struct usb_hcd *hcd;
         struct ohci_hcd *ohci;
         struct resource res;
@@ -244,18 +244,13 @@ MODULE_DEVICE_TABLE(of, ohci_hcd_ppc_of_match);
 
 
 static struct of_platform_driver ohci_hcd_ppc_of_driver = {
-        .name           = "ppc-of-ohci",
-        .match_table    = ohci_hcd_ppc_of_match,
         .probe          = ohci_hcd_ppc_of_probe,
         .remove         = ohci_hcd_ppc_of_remove,
         .shutdown       = ohci_hcd_ppc_of_shutdown,
-#ifdef CONFIG_PM
-        /*.suspend      = ohci_hcd_ppc_soc_drv_suspend,*/
-        /*.resume       = ohci_hcd_ppc_soc_drv_resume,*/
-#endif
-        .driver         = {
-                .name   = "ppc-of-ohci",
-                .owner  = THIS_MODULE,
+        .driver = {
+                .name = "ppc-of-ohci",
+                .owner = THIS_MODULE,
+                .of_match_table = ohci_hcd_ppc_of_match,
         },
 };