8 files changed, 9 insertions, 9 deletions

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index be1fa0723f2c..399e15fc5052 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -286,7 +286,7 @@ static int usb_dev_restore(struct device *dev)
         return usb_resume(dev);
 }
 
-static struct pm_ops usb_device_pm_ops = {
+static struct dev_pm_ops usb_device_pm_ops = {
         .prepare =      usb_dev_prepare,
         .complete =     usb_dev_complete,
         .suspend =      usb_dev_suspend,
@@ -301,7 +301,7 @@ static struct pm_ops usb_device_pm_ops = {
 
 #define ksuspend_usb_init()     0
 #define ksuspend_usb_cleanup()  do {} while (0)
-#define usb_device_pm_ops       (*(struct pm_ops *)0)
+#define usb_device_pm_ops       (*(struct dev_pm_ops *)0)
 
 #endif  /* CONFIG_PM */
 
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index a8a1de413321..0b2bb8f0706d 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1474,7 +1474,7 @@ static struct at91_udc controller = {
                 .ep0    = &controller.ep[0].ep,
                 .name   = driver_name,
                 .dev    = {
-                        .bus_id = "gadget",
+                        .init_name = "gadget",
                         .release = nop_release,
                 }
         },
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index ae30ab1d264f..65b03e3445a1 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -1034,7 +1034,7 @@ static struct usba_udc the_udc = {
                 .is_dualspeed   = 1,
                 .name           = "atmel_usba_udc",
                 .dev    = {
-                        .bus_id         = "gadget",
+                        .init_name      = "gadget",
                         .release        = nop_release,
                 },
         },
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index b3408ff39fba..f40272565098 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2545,7 +2545,7 @@ static int __devinit qe_udc_probe(struct of_device *ofdev,
 
         device_initialize(&udc_controller->gadget.dev);
 
-        strcpy(udc_controller->gadget.dev.bus_id, "gadget");
+        dev_set_name(&udc_controller->gadget.dev, "gadget");
 
         udc_controller->gadget.dev.release = qe_udc_release;
         udc_controller->gadget.dev.parent = &ofdev->dev;
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index c6e7df04c69a..d554b0895603 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -1981,7 +1981,7 @@ static struct lh7a40x_udc memory = {
                    .ep0 = &memory.ep[0].ep,
                    .name = driver_name,
                    .dev = {
-                           .bus_id = "gadget",
+                           .init_name = "gadget",
                            .release = nop_release,
                            },
                    },
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 8c5026be79d4..697a0ca349bf 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -1833,7 +1833,7 @@ static struct pxa25x_udc memory = {
                 .ep0            = &memory.ep[0].ep,
                 .name           = driver_name,
                 .dev = {
-                        .bus_id         = "gadget",
+                        .init_name      = "gadget",
                         .release        = nop_release,
                 },
         },
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 944e4ff641df..65110d02a206 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -2162,7 +2162,7 @@ static struct pxa_udc memory = {
                 .ep0            = &memory.udc_usb_ep[0].usb_ep,
                 .name           = driver_name,
                 .dev = {
-                        .bus_id         = "gadget",
+                        .init_name      = "gadget",
                 },
         },
 
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 8d8d65165983..c7e255636803 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1727,7 +1727,7 @@ static struct s3c2410_udc memory = {
                 .ep0            = &memory.ep[0].ep,
                 .name           = gadget_name,
                 .dev = {
-                        .bus_id         = "gadget",
+                        .init_name      = "gadget",
                 },
         },