4 files changed, 11 insertions, 9 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 6fbc8f5ab80c..20290c5b1562 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1729,9 +1729,9 @@ static int usb_classdev_add(struct usb_device *dev)
 {
         struct device *cldev;
 
-        cldev = device_create(usb_classdev_class, &dev->dev, dev->dev.devt,
-                              "usbdev%d.%d", dev->bus->busnum,
-                              dev->devnum);
+        cldev = device_create_drvdata(usb_classdev_class, &dev->dev,
+                                      dev->dev.devt, NULL, "usbdev%d.%d",
+                                      dev->bus->busnum, dev->devnum);
         if (IS_ERR(cldev))
                 return PTR_ERR(cldev);
         dev->usb_classdev = cldev;
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index 913fb8667899..6b1b229e38cd 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -196,8 +196,9 @@ int usb_register_dev(struct usb_interface *intf,
                 ++temp;
         else
                 temp = name;
-        intf->usb_dev = device_create(usb_class->class, &intf->dev,
-                                      MKDEV(USB_MAJOR, minor), "%s", temp);
+        intf->usb_dev = device_create_drvdata(usb_class->class, &intf->dev,
+                                              MKDEV(USB_MAJOR, minor), NULL,
+                                              "%s", temp);
         if (IS_ERR(intf->usb_dev)) {
                 down_write(&minor_rwsem);
                 usb_minors[intf->minor] = NULL;
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 9caaec3ae9a3..49cd9e145a9b 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -1360,8 +1360,8 @@ printer_bind(struct usb_gadget *gadget)
 
 
         /* Setup the sysfs files for the printer gadget. */
-        dev->pdev = device_create(usb_gadget_class, NULL, g_printer_devno,
-                        "g_printer");
+        dev->pdev = device_create_drvdata(usb_gadget_class, NULL,
+                                          g_printer_devno, NULL, "g_printer");
         if (IS_ERR(dev->pdev)) {
                 ERROR(dev, "Failed to create device: g_printer\n");
                 goto fail;
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index 293a46247c3b..6566fc0a3228 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -1162,8 +1162,9 @@ int mon_bin_add(struct mon_bus *mbus, const struct usb_bus *ubus)
         if (minor >= MON_BIN_MAX_MINOR)
                 return 0;
 
-        dev = device_create(mon_bin_class, ubus? ubus->controller: NULL,
-                        MKDEV(MAJOR(mon_bin_dev0), minor), "usbmon%d", minor);
+        dev = device_create_drvdata(mon_bin_class, ubus? ubus->controller: NULL,
+                                    MKDEV(MAJOR(mon_bin_dev0), minor), NULL,
+                                    "usbmon%d", minor);
         if (IS_ERR(dev))
                 return 0;