aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/input/acecad.c2
-rw-r--r--drivers/usb/input/aiptek.c2
-rw-r--r--drivers/usb/input/appletouch.c2
-rw-r--r--drivers/usb/input/ati_remote.c2
-rw-r--r--drivers/usb/input/ati_remote2.c2
-rw-r--r--drivers/usb/input/gtco.c2
-rw-r--r--drivers/usb/input/kbtab.c2
-rw-r--r--drivers/usb/input/keyspan_remote.c2
-rw-r--r--drivers/usb/input/powermate.c2
-rw-r--r--drivers/usb/input/usbtouchscreen.c2
-rw-r--r--drivers/usb/input/wacom_sys.c2
-rw-r--r--drivers/usb/input/xpad.c2
-rw-r--r--drivers/usb/input/yealink.c2
13 files changed, 13 insertions, 13 deletions
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index 75972b7d4c83..be8e9243c062 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -185,7 +185,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
185 input_dev->name = acecad->name; 185 input_dev->name = acecad->name;
186 input_dev->phys = acecad->phys; 186 input_dev->phys = acecad->phys;
187 usb_to_input_id(dev, &input_dev->id); 187 usb_to_input_id(dev, &input_dev->id);
188 input_dev->cdev.dev = &intf->dev; 188 input_dev->dev.parent = &intf->dev;
189 189
190 input_set_drvdata(input_dev, acecad); 190 input_set_drvdata(input_dev, acecad);
191 191
diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 8b33a8eae8a1..cc0a498763d8 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -2044,7 +2044,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
2044 inputdev->name = "Aiptek"; 2044 inputdev->name = "Aiptek";
2045 inputdev->phys = aiptek->features.usbPath; 2045 inputdev->phys = aiptek->features.usbPath;
2046 usb_to_input_id(usbdev, &inputdev->id); 2046 usb_to_input_id(usbdev, &inputdev->id);
2047 inputdev->cdev.dev = &intf->dev; 2047 inputdev->dev.parent = &intf->dev;
2048 2048
2049 input_set_drvdata(inputdev, aiptek); 2049 input_set_drvdata(inputdev, aiptek);
2050 2050
diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c
index ef6166ab8fe7..e3215267db11 100644
--- a/drivers/usb/input/appletouch.c
+++ b/drivers/usb/input/appletouch.c
@@ -584,7 +584,7 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id
584 input_dev->name = "appletouch"; 584 input_dev->name = "appletouch";
585 input_dev->phys = dev->phys; 585 input_dev->phys = dev->phys;
586 usb_to_input_id(dev->udev, &input_dev->id); 586 usb_to_input_id(dev->udev, &input_dev->id);
587 input_dev->cdev.dev = &iface->dev; 587 input_dev->dev.parent = &iface->dev;
588 588
589 input_set_drvdata(input_dev, dev); 589 input_set_drvdata(input_dev, dev);
590 590
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 876b2725609d..5d3ddb916668 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -662,7 +662,7 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
662 idev->phys = ati_remote->phys; 662 idev->phys = ati_remote->phys;
663 663
664 usb_to_input_id(ati_remote->udev, &idev->id); 664 usb_to_input_id(ati_remote->udev, &idev->id);
665 idev->cdev.dev = &ati_remote->udev->dev; 665 idev->dev.parent = &ati_remote->udev->dev;
666} 666}
667 667
668static int ati_remote_initialize(struct ati_remote *ati_remote) 668static int ati_remote_initialize(struct ati_remote *ati_remote)
diff --git a/drivers/usb/input/ati_remote2.c b/drivers/usb/input/ati_remote2.c
index 3c38ac649d2e..a9032aa3465f 100644
--- a/drivers/usb/input/ati_remote2.c
+++ b/drivers/usb/input/ati_remote2.c
@@ -362,7 +362,7 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
362 idev->phys = ar2->phys; 362 idev->phys = ar2->phys;
363 363
364 usb_to_input_id(ar2->udev, &idev->id); 364 usb_to_input_id(ar2->udev, &idev->id);
365 idev->cdev.dev = &ar2->udev->dev; 365 idev->dev.parent = &ar2->udev->dev;
366 366
367 retval = input_register_device(idev); 367 retval = input_register_device(idev);
368 if (retval) 368 if (retval)
diff --git a/drivers/usb/input/gtco.c b/drivers/usb/input/gtco.c
index 75cce2a97d20..dbd207efb8f5 100644
--- a/drivers/usb/input/gtco.c
+++ b/drivers/usb/input/gtco.c
@@ -952,7 +952,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
952 952
953 /* Set input device required ID information */ 953 /* Set input device required ID information */
954 usb_to_input_id(gtco->usbdev, &input_dev->id); 954 usb_to_input_id(gtco->usbdev, &input_dev->id);
955 input_dev->cdev.dev = &usbinterface->dev; 955 input_dev->dev.parent = &usbinterface->dev;
956 956
957 /* Setup the URB, it will be posted later on open of input device */ 957 /* Setup the URB, it will be posted later on open of input device */
958 endpoint = &usbinterface->altsetting[0].endpoint[0].desc; 958 endpoint = &usbinterface->altsetting[0].endpoint[0].desc;
diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index 7ec999adb882..c4781b9d1297 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -146,7 +146,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
146 input_dev->name = "KB Gear Tablet"; 146 input_dev->name = "KB Gear Tablet";
147 input_dev->phys = kbtab->phys; 147 input_dev->phys = kbtab->phys;
148 usb_to_input_id(dev, &input_dev->id); 148 usb_to_input_id(dev, &input_dev->id);
149 input_dev->cdev.dev = &intf->dev; 149 input_dev->dev.parent = &intf->dev;
150 150
151 input_set_drvdata(input_dev, kbtab); 151 input_set_drvdata(input_dev, kbtab);
152 152
diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index daf8f218a1f4..1bffc9fa98c2 100644
--- a/drivers/usb/input/keyspan_remote.c
+++ b/drivers/usb/input/keyspan_remote.c
@@ -495,7 +495,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic
495 input_dev->name = remote->name; 495 input_dev->name = remote->name;
496 input_dev->phys = remote->phys; 496 input_dev->phys = remote->phys;
497 usb_to_input_id(udev, &input_dev->id); 497 usb_to_input_id(udev, &input_dev->id);
498 input_dev->cdev.dev = &interface->dev; 498 input_dev->dev.parent = &interface->dev;
499 499
500 input_dev->evbit[0] = BIT(EV_KEY); /* We will only report KEY events. */ 500 input_dev->evbit[0] = BIT(EV_KEY); /* We will only report KEY events. */
501 for (i = 0; i < ARRAY_SIZE(keyspan_key_table); i++) 501 for (i = 0; i < ARRAY_SIZE(keyspan_key_table); i++)
diff --git a/drivers/usb/input/powermate.c b/drivers/usb/input/powermate.c
index f951a4482ef4..4f93a760faee 100644
--- a/drivers/usb/input/powermate.c
+++ b/drivers/usb/input/powermate.c
@@ -359,7 +359,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i
359 359
360 input_dev->phys = pm->phys; 360 input_dev->phys = pm->phys;
361 usb_to_input_id(udev, &input_dev->id); 361 usb_to_input_id(udev, &input_dev->id);
362 input_dev->cdev.dev = &intf->dev; 362 input_dev->dev.parent = &intf->dev;
363 363
364 input_set_drvdata(input_dev, pm); 364 input_set_drvdata(input_dev, pm);
365 365
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 169692729b80..e0829413336b 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -740,7 +740,7 @@ static int usbtouch_probe(struct usb_interface *intf,
740 input_dev->name = usbtouch->name; 740 input_dev->name = usbtouch->name;
741 input_dev->phys = usbtouch->phys; 741 input_dev->phys = usbtouch->phys;
742 usb_to_input_id(udev, &input_dev->id); 742 usb_to_input_id(udev, &input_dev->id);
743 input_dev->cdev.dev = &intf->dev; 743 input_dev->dev.parent = &intf->dev;
744 744
745 input_set_drvdata(input_dev, usbtouch); 745 input_set_drvdata(input_dev, usbtouch);
746 746
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index 7793ffbf5256..1fe48208c2f4 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/usb/input/wacom_sys.c
@@ -230,7 +230,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
230 wacom->wacom_wac = wacom_wac; 230 wacom->wacom_wac = wacom_wac;
231 usb_to_input_id(dev, &input_dev->id); 231 usb_to_input_id(dev, &input_dev->id);
232 232
233 input_dev->cdev.dev = &intf->dev; 233 input_dev->dev.parent = &intf->dev;
234 234
235 input_set_drvdata(input_dev, wacom); 235 input_set_drvdata(input_dev, wacom);
236 236
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c
index b00179626bee..735723912950 100644
--- a/drivers/usb/input/xpad.c
+++ b/drivers/usb/input/xpad.c
@@ -345,7 +345,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
345 input_dev->name = xpad_device[i].name; 345 input_dev->name = xpad_device[i].name;
346 input_dev->phys = xpad->phys; 346 input_dev->phys = xpad->phys;
347 usb_to_input_id(udev, &input_dev->id); 347 usb_to_input_id(udev, &input_dev->id);
348 input_dev->cdev.dev = &intf->dev; 348 input_dev->dev.parent = &intf->dev;
349 349
350 input_set_drvdata(input_dev, xpad); 350 input_set_drvdata(input_dev, xpad);
351 351
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index 294224e20f49..c54f1a5dcb4a 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -937,7 +937,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
937 input_dev->name = nfo->name; 937 input_dev->name = nfo->name;
938 input_dev->phys = yld->phys; 938 input_dev->phys = yld->phys;
939 usb_to_input_id(udev, &input_dev->id); 939 usb_to_input_id(udev, &input_dev->id);
940 input_dev->cdev.dev = &intf->dev; 940 input_dev->dev.parent = &intf->dev;
941 941
942 input_set_drvdata(input_dev, yld); 942 input_set_drvdata(input_dev, yld);
943 943