device create: usb: convert device_create to device_create_drvdata

device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 6 insertions, 5 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;