Input: joysticks - 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/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index 4ac1a8f2169b1297acd9229853c8b7a229432400..ff701ab10d74f71e0ffcee5f953fc2428d3ef817 100644 (file)
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -314,7 +314,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_MADCATZ;
        input_dev->id.product = a3d->mode;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &gameport->dev;
+       input_dev->dev.parent = &gameport->dev;
        input_dev->open = a3d_open;
        input_dev->close = a3d_close;
 

diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index e8353526736fbf035d37d6ee92dc76bc6f82efbc..28140c4a110df399c713d7ad337dfd177885455e 100644 (file)
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -424,7 +424,7 @@ static int adi_init_input(struct adi *adi, struct adi_port *port, int half)
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_LOGITECH;
        input_dev->id.product = adi->id;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &port->gameport->dev;
+       input_dev->dev.parent = &port->gameport->dev;
 
        input_set_drvdata(input_dev, port);
 

diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 7244e296bb26b1e3b4d0257adaf3761800604b49..1c1afb5d46842c5c3954275ca0cffcbb9e1a32de 100644 (file)
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -449,6 +449,7 @@ static int analog_init_device(struct analog_port *port, struct analog *analog, i
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_ANALOG;
        input_dev->id.product = analog->mask >> 4;
        input_dev->id.version = 0x0100;
+       input_dev->dev.parent = &port->gameport->dev;
 
        input_set_drvdata(input_dev, port);
 

diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 207536377fa8b9d4dce85c54f7efcf639f230e13..d3352a849b85f592b08df3140af53c0b594c0366 100644 (file)
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -211,7 +211,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
                input_dev->id.vendor = GAMEPORT_ID_VENDOR_CREATIVE;
                input_dev->id.product = 0x0008;
                input_dev->id.version = 0x0100;
-               input_dev->cdev.dev = &gameport->dev;
+               input_dev->dev.parent = &gameport->dev;
 
                input_set_drvdata(input_dev, cobra);
 

diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index ac7db7a1f8dbc619422c04c5c812d6d7f7be8444..d514aebf75541fc871b56b510f1c4410bef2990c 100644 (file)
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -308,7 +308,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_GENIUS;
        input_dev->id.product = gf2k->id;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &gameport->dev;
+       input_dev->dev.parent = &gameport->dev;
 
        input_set_drvdata(input_dev, gf2k);
 

diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index 41da7f17d6eee316f2a5f35f0d3dd5647e705736..73eb5ab6f140caa4bc8b9dd5eb34346335f1b1c2 100644 (file)
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -363,7 +363,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
                input_dev->id.vendor = GAMEPORT_ID_VENDOR_GRAVIS;
                input_dev->id.product = grip->mode[i];
                input_dev->id.version = 0x0100;
-               input_dev->cdev.dev = &gameport->dev;
+               input_dev->dev.parent = &gameport->dev;
 
                input_set_drvdata(input_dev, grip);
 

diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 1771d5d8679053237335a444660fcb573e566161..555319e6378c47620d9a187b3493c5c82cfe0553 100644 (file)
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -599,7 +599,7 @@ static int register_slot(int slot, struct grip_mp *grip)
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_GRAVIS;
        input_dev->id.product = 0x0100 + port->mode;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &grip->gameport->dev;
+       input_dev->dev.parent = &grip->gameport->dev;
 
        input_set_drvdata(input_dev, grip);
 

diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index 3e022dc83941b19872522b3da709e6c29fc00e5f..d4e8073caf27a98a603a33a9eb0323f7e300701d 100644 (file)
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -231,7 +231,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_GUILLEMOT;
        input_dev->id.product = guillemot_type[i].id;
        input_dev->id.version = (int)data[14] << 8 | data[15];
-       input_dev->cdev.dev = &gameport->dev;
+       input_dev->dev.parent = &gameport->dev;
 
        input_set_drvdata(input_dev, guillemot);
 

diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index bd5a6de69a6b716f7edb04ed4a6a51303fee92db..fb129c479a666124670bfba0652f01ba66fb5ba2 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -287,13 +287,13 @@ int iforce_init_device(struct iforce *iforce)
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
        case IFORCE_USB:
                input_dev->id.bustype = BUS_USB;
-               input_dev->cdev.dev = &iforce->usbdev->dev;
+               input_dev->dev.parent = &iforce->usbdev->dev;
                break;
 #endif
 #ifdef CONFIG_JOYSTICK_IFORCE_232
        case IFORCE_232:
                input_dev->id.bustype = BUS_RS232;
-               input_dev->cdev.dev = &iforce->serio->dev;
+               input_dev->dev.parent = &iforce->serio->dev;
                break;
 #endif
        }

diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index f0ff78384cbe7388ef739caf2598ae9bc32b34a5..1aec1e9d7c5942f2b58d090778a08516ccee79b4 100644 (file)
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -262,6 +262,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_INTERACT;
        input_dev->id.product = interact_type[i].id;
        input_dev->id.version = 0x0100;
+       input_dev->dev.parent = &gameport->dev;
 
        input_set_drvdata(input_dev, interact);
 

diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 31f6866a2efebb6fa71bfdbccd7e3d89560779ab..b35604ee43aecd4318a4fb126a4c0d40a9db7279 100644 (file)
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -168,7 +168,7 @@ static int magellan_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_MAGELLAN;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 

diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index f800c39475b3cd9b296b90ff9801b600d9d65d3e..2adf73f63c94dd7898d7ef1091a4c5842bb832c4 100644 (file)
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -751,7 +751,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
                input_dev->id.vendor = GAMEPORT_ID_VENDOR_MICROSOFT;
                input_dev->id.product = sw->type;
                input_dev->id.version = 0x0100;
-               input_dev->cdev.dev = &gameport->dev;
+               input_dev->dev.parent = &gameport->dev;
 
                input_set_drvdata(input_dev, sw);
 

diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index dd611deecb0e63396ee3fd0b02224c19d5f162eb..abb7c4cf54ad50d07fe3bcff57d7eceea86f18d4 100644 (file)
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -226,7 +226,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_SPACEBALL;
        input_dev->id.product = id;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 

diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index f5e496679e2bb35e0c151f9bbb973bdfa100c772..c4937f1e837c192dd41ab252d933ac81308e8e4b 100644 (file)
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -183,7 +183,7 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_SPACEORB;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 

diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index b6a6f21cc9210cc3e90aba5a68614126be2205f6..8581ee991d4e8e90cff96d8dee1fcfc3f038855d 100644 (file)
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -154,7 +154,7 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_STINGER;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
        input_dev->keybit[LONG(BTN_A)] = BIT(BTN_A) | BIT(BTN_B) | BIT(BTN_C) | BIT(BTN_X) |

diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 53260d11fd67e9505bec8a6de5e9e0aa25e3f28a..3b36ee04f7261848e87c0c61c45b9e517e1bf218 100644 (file)
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -326,7 +326,7 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
        input_dev->id.vendor = GAMEPORT_ID_VENDOR_THRUSTMASTER;
        input_dev->id.product = model->id;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &tmdc->gameport->dev;
+       input_dev->dev.parent = &tmdc->gameport->dev;
 
        input_set_drvdata(input_dev, tmdc);
 

diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index 458a129b4b2250238d34465a2d6946dd747fcb86..c91504ec38ebf012423b46db735d90174697580a 100644 (file)
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -205,10 +205,9 @@ static int twidjoy_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_TWIDJOY;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-       input_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
        input_set_abs_params(input_dev, ABS_X, -50, 50, 4, 4);
        input_set_abs_params(input_dev, ABS_Y, -50, 50, 4, 4);
 

diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index e0927a562905fc1905f4806df7479891851d41c3..4e85f72eefd7075b4a6a7c9ae339c64a8dec6d4d 100644 (file)
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -160,7 +160,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_WARRIOR;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
        input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2);