diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 23:03:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 12:24:45 -0400 |
commit | b0b090e5792fa228b5c825fcc5e1b7b0da7abec9 (patch) | |
tree | 217d6f95fb63c158383beb026e8fb45ce6fd873e /drivers/usb/misc | |
parent | abe9ab8f62203ced11119fb96acc3b8dd107ebc4 (diff) |
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>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r-- | drivers/usb/misc/phidgetkit.c | 5 | ||||
-rw-r--r-- | drivers/usb/misc/phidgetmotorcontrol.c | 5 | ||||
-rw-r--r-- | drivers/usb/misc/phidgetservo.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c index 4cfa25b0f44e..cc8e0a926f99 100644 --- a/drivers/usb/misc/phidgetkit.c +++ b/drivers/usb/misc/phidgetkit.c | |||
@@ -595,9 +595,8 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic | |||
595 | } while(value); | 595 | } while(value); |
596 | kit->dev_no = bit; | 596 | kit->dev_no = bit; |
597 | 597 | ||
598 | kit->dev = device_create_drvdata(phidget_class, &kit->udev->dev, | 598 | kit->dev = device_create(phidget_class, &kit->udev->dev, MKDEV(0, 0), |
599 | MKDEV(0, 0), kit, | 599 | kit, "interfacekit%d", kit->dev_no); |
600 | "interfacekit%d", kit->dev_no); | ||
601 | if (IS_ERR(kit->dev)) { | 600 | if (IS_ERR(kit->dev)) { |
602 | rc = PTR_ERR(kit->dev); | 601 | rc = PTR_ERR(kit->dev); |
603 | kit->dev = NULL; | 602 | kit->dev = NULL; |
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c index 9b4696f21b22..38088b44349e 100644 --- a/drivers/usb/misc/phidgetmotorcontrol.c +++ b/drivers/usb/misc/phidgetmotorcontrol.c | |||
@@ -365,9 +365,8 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic | |||
365 | } while(value); | 365 | } while(value); |
366 | mc->dev_no = bit; | 366 | mc->dev_no = bit; |
367 | 367 | ||
368 | mc->dev = device_create_drvdata(phidget_class, &mc->udev->dev, | 368 | mc->dev = device_create(phidget_class, &mc->udev->dev, MKDEV(0, 0), mc, |
369 | MKDEV(0, 0), mc, | 369 | "motorcontrol%d", mc->dev_no); |
370 | "motorcontrol%d", mc->dev_no); | ||
371 | if (IS_ERR(mc->dev)) { | 370 | if (IS_ERR(mc->dev)) { |
372 | rc = PTR_ERR(mc->dev); | 371 | rc = PTR_ERR(mc->dev); |
373 | mc->dev = NULL; | 372 | mc->dev = NULL; |
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c index 1ca7ddb41d4d..bef6fe16364b 100644 --- a/drivers/usb/misc/phidgetservo.c +++ b/drivers/usb/misc/phidgetservo.c | |||
@@ -275,9 +275,8 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id) | |||
275 | } while (value); | 275 | } while (value); |
276 | dev->dev_no = bit; | 276 | dev->dev_no = bit; |
277 | 277 | ||
278 | dev->dev = device_create_drvdata(phidget_class, &dev->udev->dev, | 278 | dev->dev = device_create(phidget_class, &dev->udev->dev, MKDEV(0, 0), |
279 | MKDEV(0, 0), dev, | 279 | dev, "servo%d", dev->dev_no); |
280 | "servo%d", dev->dev_no); | ||
281 | if (IS_ERR(dev->dev)) { | 280 | if (IS_ERR(dev->dev)) { |
282 | rc = PTR_ERR(dev->dev); | 281 | rc = PTR_ERR(dev->dev); |
283 | dev->dev = NULL; | 282 | dev->dev = NULL; |