Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

device create: usb: convert device_create_drvdata to device_create

Now that device_create() has been audited, rename things back to the
original call to be sane.

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

+19 -23
+3 -3
drivers/usb/core/devio.c
··· 1729 1729 { 1730 1730 struct device *cldev; 1731 1731 1732 - cldev = device_create_drvdata(usb_classdev_class, &dev->dev, 1733 - dev->dev.devt, NULL, "usbdev%d.%d", 1734 - dev->bus->busnum, dev->devnum); 1732 + cldev = device_create(usb_classdev_class, &dev->dev, dev->dev.devt, 1733 + NULL, "usbdev%d.%d", dev->bus->busnum, 1734 + dev->devnum); 1735 1735 if (IS_ERR(cldev)) 1736 1736 return PTR_ERR(cldev); 1737 1737 dev->usb_classdev = cldev;
+3 -3
drivers/usb/core/file.c
··· 196 196 ++temp; 197 197 else 198 198 temp = name; 199 - intf->usb_dev = device_create_drvdata(usb_class->class, &intf->dev, 200 - MKDEV(USB_MAJOR, minor), NULL, 201 - "%s", temp); 199 + intf->usb_dev = device_create(usb_class->class, &intf->dev, 200 + MKDEV(USB_MAJOR, minor), NULL, 201 + "%s", temp); 202 202 if (IS_ERR(intf->usb_dev)) { 203 203 down_write(&minor_rwsem); 204 204 usb_minors[intf->minor] = NULL;
+2 -3
drivers/usb/core/hcd.c
··· 818 818 set_bit (busnum, busmap.busmap); 819 819 bus->busnum = busnum; 820 820 821 - bus->dev = device_create_drvdata(usb_host_class, bus->controller, 822 - MKDEV(0, 0), bus, 823 - "usb_host%d", busnum); 821 + bus->dev = device_create(usb_host_class, bus->controller, MKDEV(0, 0), 822 + bus, "usb_host%d", busnum); 824 823 result = PTR_ERR(bus->dev); 825 824 if (IS_ERR(bus->dev)) 826 825 goto error_create_class_dev;
+2 -2
drivers/usb/gadget/printer.c
··· 1360 1360 1361 1361 1362 1362 /* Setup the sysfs files for the printer gadget. */ 1363 - dev->pdev = device_create_drvdata(usb_gadget_class, NULL, 1364 - g_printer_devno, NULL, "g_printer"); 1363 + dev->pdev = device_create(usb_gadget_class, NULL, g_printer_devno, 1364 + NULL, "g_printer"); 1365 1365 if (IS_ERR(dev->pdev)) { 1366 1366 ERROR(dev, "Failed to create device: g_printer\n"); 1367 1367 goto fail;
+2 -3
drivers/usb/misc/phidgetkit.c
··· 595 595 } while(value); 596 596 kit->dev_no = bit; 597 597 598 - kit->dev = device_create_drvdata(phidget_class, &kit->udev->dev, 599 - MKDEV(0, 0), kit, 600 - "interfacekit%d", kit->dev_no); 598 + kit->dev = device_create(phidget_class, &kit->udev->dev, MKDEV(0, 0), 599 + kit, "interfacekit%d", kit->dev_no); 601 600 if (IS_ERR(kit->dev)) { 602 601 rc = PTR_ERR(kit->dev); 603 602 kit->dev = NULL;
+2 -3
drivers/usb/misc/phidgetmotorcontrol.c
··· 365 365 } while(value); 366 366 mc->dev_no = bit; 367 367 368 - mc->dev = device_create_drvdata(phidget_class, &mc->udev->dev, 369 - MKDEV(0, 0), mc, 370 - "motorcontrol%d", mc->dev_no); 368 + mc->dev = device_create(phidget_class, &mc->udev->dev, MKDEV(0, 0), mc, 369 + "motorcontrol%d", mc->dev_no); 371 370 if (IS_ERR(mc->dev)) { 372 371 rc = PTR_ERR(mc->dev); 373 372 mc->dev = NULL;
+2 -3
drivers/usb/misc/phidgetservo.c
··· 275 275 } while (value); 276 276 dev->dev_no = bit; 277 277 278 - dev->dev = device_create_drvdata(phidget_class, &dev->udev->dev, 279 - MKDEV(0, 0), dev, 280 - "servo%d", dev->dev_no); 278 + dev->dev = device_create(phidget_class, &dev->udev->dev, MKDEV(0, 0), 279 + dev, "servo%d", dev->dev_no); 281 280 if (IS_ERR(dev->dev)) { 282 281 rc = PTR_ERR(dev->dev); 283 282 dev->dev = NULL;
+3 -3
drivers/usb/mon/mon_bin.c
··· 1162 1162 if (minor >= MON_BIN_MAX_MINOR) 1163 1163 return 0; 1164 1164 1165 - dev = device_create_drvdata(mon_bin_class, ubus? ubus->controller: NULL, 1166 - MKDEV(MAJOR(mon_bin_dev0), minor), NULL, 1167 - "usbmon%d", minor); 1165 + dev = device_create(mon_bin_class, ubus ? ubus->controller : NULL, 1166 + MKDEV(MAJOR(mon_bin_dev0), minor), NULL, 1167 + "usbmon%d", minor); 1168 1168 if (IS_ERR(dev)) 1169 1169 return 0; 1170 1170