6 files changed, 27 insertions, 25 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 ad0662354a5e..5aec92866ab3 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -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 6135732d8057..7b5c62654bfd 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -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 36360e24a9b9..100d5faebe3c 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -121,8 +121,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 003aea21c35e..df165917412a 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -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,
         },
 };