Input: USB devices - switch to using input_dev->dev.parent

In preparation for struct class_device -> struct device input
core conversion, switch to using input_dev->dev.parent when
specifying device position in sysfs tree.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index 75972b7d4c83269662f80c9395a9da704b73d0f0..be8e9243c06203579e81b2e5a2ccff27c7a8fe8b 100644 (file)
--- 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_
        input_dev->name = acecad->name;
        input_dev->phys = acecad->phys;
        usb_to_input_id(dev, &input_dev->id);
-       input_dev->cdev.dev = &intf->dev;
+       input_dev->dev.parent = &intf->dev;
 
        input_set_drvdata(input_dev, acecad);
 

diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 8b33a8eae8a114757221e57160a9810c1b9d2f7a..cc0a498763d8db609e7dd03d5086f50010931765 100644 (file)
--- 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)
        inputdev->name = "Aiptek";
        inputdev->phys = aiptek->features.usbPath;
        usb_to_input_id(usbdev, &inputdev->id);
-       inputdev->cdev.dev = &intf->dev;
+       inputdev->dev.parent = &intf->dev;
 
        input_set_drvdata(inputdev, aiptek);
 

diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c
index ef6166ab8fe757503ddf799c7ca23afca077670b..e3215267db112dcc89818ff41b0f5ca601c30151 100644 (file)
--- 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
        input_dev->name = "appletouch";
        input_dev->phys = dev->phys;
        usb_to_input_id(dev->udev, &input_dev->id);
-       input_dev->cdev.dev = &iface->dev;
+       input_dev->dev.parent = &iface->dev;
 
        input_set_drvdata(input_dev, dev);
 

diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 876b2725609da77dcfa43ad9b94907be8fa461f4..5d3ddb9166684d31a8be4dea42a4d1a033a7df3d 100644 (file)
--- 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)
        idev->phys = ati_remote->phys;
 
        usb_to_input_id(ati_remote->udev, &idev->id);
-       idev->cdev.dev = &ati_remote->udev->dev;
+       idev->dev.parent = &ati_remote->udev->dev;
 }
 
 static 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 3c38ac649d2e4a57f8a3a3cde3dae31a1ca99d39..a9032aa3465f7bb5d70806af6bb4d55b0cee041a 100644 (file)
--- 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)
        idev->phys = ar2->phys;
 
        usb_to_input_id(ar2->udev, &idev->id);
-       idev->cdev.dev = &ar2->udev->dev;
+       idev->dev.parent = &ar2->udev->dev;
 
        retval = input_register_device(idev);
        if (retval)

diff --git a/drivers/usb/input/gtco.c b/drivers/usb/input/gtco.c
index 75cce2a97d201a4f6c660de1749221b7397a8311..dbd207efb8f581019b1a608323a6a17391a0b92f 100644 (file)
--- a/drivers/usb/input/gtco.c
+++ b/drivers/usb/input/gtco.c
@@ -952,7 +952,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
 
        /* Set input device required ID information */
        usb_to_input_id(gtco->usbdev, &input_dev->id);
-       input_dev->cdev.dev = &usbinterface->dev;
+       input_dev->dev.parent = &usbinterface->dev;
 
        /* Setup the URB, it will be posted later on open of input device */
        endpoint = &usbinterface->altsetting[0].endpoint[0].desc;

diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index 7ec999adb8829ba4b8528f80248f8d99d3086be8..c4781b9d1297c025778f2cc5324816ffb2b62b6d 100644 (file)
--- 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
        input_dev->name = "KB Gear Tablet";
        input_dev->phys = kbtab->phys;
        usb_to_input_id(dev, &input_dev->id);
-       input_dev->cdev.dev = &intf->dev;
+       input_dev->dev.parent = &intf->dev;
 
        input_set_drvdata(input_dev, kbtab);
 

diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index daf8f218a1f438a9438b9d1ed13560f68976abd6..1bffc9fa98c270f3c8898a70a423602867846d9e 100644 (file)
--- 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
        input_dev->name = remote->name;
        input_dev->phys = remote->phys;
        usb_to_input_id(udev, &input_dev->id);
-       input_dev->cdev.dev = &interface->dev;
+       input_dev->dev.parent = &interface->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY);              /* We will only report KEY events. */
        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 f951a4482ef4c532e30c8b7183077fdc9eb86470..4f93a760faeed74c699c23704178341359d2cdad 100644 (file)
--- 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
 
        input_dev->phys = pm->phys;
        usb_to_input_id(udev, &input_dev->id);
-       input_dev->cdev.dev = &intf->dev;
+       input_dev->dev.parent = &intf->dev;
 
        input_set_drvdata(input_dev, pm);
 

diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 169692729b80f3e35a4243ed23a4e31c4b7b9102..e0829413336b669a3d152681982930ec2480e013 100644 (file)
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -740,7 +740,7 @@ static int usbtouch_probe(struct usb_interface *intf,
        input_dev->name = usbtouch->name;
        input_dev->phys = usbtouch->phys;
        usb_to_input_id(udev, &input_dev->id);
-       input_dev->cdev.dev = &intf->dev;
+       input_dev->dev.parent = &intf->dev;
 
        input_set_drvdata(input_dev, usbtouch);
 

diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index 7793ffbf5256fa9996fa6aa1954fb137a5d9eefc..1fe48208c2f4cd6d5aa875a31f1e907fd2607d10 100644 (file)
--- 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
        wacom->wacom_wac = wacom_wac;
        usb_to_input_id(dev, &input_dev->id);
 
-       input_dev->cdev.dev = &intf->dev;
+       input_dev->dev.parent = &intf->dev;
 
        input_set_drvdata(input_dev, wacom);
 

diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c
index b00179626beea5a8b9d9e62b128594c1c6880112..73572391295082f8747d2546fd7109799b882c73 100644 (file)
--- 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
        input_dev->name = xpad_device[i].name;
        input_dev->phys = xpad->phys;
        usb_to_input_id(udev, &input_dev->id);
-       input_dev->cdev.dev = &intf->dev;
+       input_dev->dev.parent = &intf->dev;
 
        input_set_drvdata(input_dev, xpad);
 

diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index 294224e20f4965adaab4ba5d985cd92a6d6545fe..c54f1a5dcb4a480ba19fe04d907fa0a9184f4503 100644 (file)
--- 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)
        input_dev->name = nfo->name;
        input_dev->phys = yld->phys;
        usb_to_input_id(udev, &input_dev->id);
-       input_dev->cdev.dev = &intf->dev;
+       input_dev->dev.parent = &intf->dev;
 
        input_set_drvdata(input_dev, yld);