Commit bc00bc92 authored May 21, 2008 by Greg Kroah-Hartman

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>

parent 3d81252d

drivers/usb/core/devio.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

drivers/usb/core/file.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;

drivers/usb/gadget/printer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

drivers/usb/mon/mon_bin.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;