From: Andrew Morton Cc: Kay Sievers Cc: Dmitry Torokhov Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/input/joystick/gf2k.c | 2 +- drivers/input/joystick/grip.c | 2 +- drivers/input/joystick/grip_mp.c | 2 +- drivers/input/joystick/guillemot.c | 2 +- drivers/input/joystick/iforce/iforce-main.c | 4 ++-- drivers/input/joystick/magellan.c | 2 +- drivers/input/joystick/sidewinder.c | 2 +- drivers/input/joystick/spaceball.c | 2 +- drivers/input/joystick/spaceorb.c | 2 +- drivers/input/joystick/stinger.c | 2 +- drivers/input/joystick/tmdc.c | 2 +- drivers/input/joystick/twidjoy.c | 2 +- drivers/input/joystick/warrior.c | 2 +- drivers/input/keyboard/corgikbd.c | 2 +- drivers/input/keyboard/spitzkbd.c | 2 +- drivers/input/misc/ixp4xx-beeper.c | 2 +- drivers/input/misc/m68kspkr.c | 2 +- drivers/input/misc/sparcspkr.c | 2 +- drivers/input/mouse/vsxxxaa.c | 2 +- drivers/input/touchscreen/ads7846.c | 2 +- drivers/input/touchscreen/corgi_ts.c | 2 +- drivers/input/touchscreen/elo.c | 2 +- drivers/input/touchscreen/h3600_ts_input.c | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff -puN drivers/input/touchscreen/ads7846.c~gregkh-driver-input-device-even-more-fixes drivers/input/touchscreen/ads7846.c --- a/drivers/input/touchscreen/ads7846.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/touchscreen/ads7846.c @@ -660,7 +660,7 @@ static int __devinit ads7846_probe(struc input_dev->name = "ADS784x Touchscreen"; input_dev->phys = ts->phys; - input_dev->cdev.dev = &spi->dev; + input_dev->d.parent = &spi->dev; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); diff -puN drivers/input/joystick/iforce/iforce-main.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/iforce/iforce-main.c --- a/drivers/input/joystick/iforce/iforce-main.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/iforce/iforce-main.c @@ -363,13 +363,13 @@ int iforce_init_device(struct iforce *if #ifdef CONFIG_JOYSTICK_IFORCE_USB case IFORCE_USB: input_dev->id.bustype = BUS_USB; - input_dev->cdev.dev = &iforce->usbdev->dev; + input_dev->d.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->d.parent = &iforce->serio->dev; break; #endif } diff -puN drivers/input/joystick/gf2k.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/gf2k.c --- a/drivers/input/joystick/gf2k.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/gf2k.c @@ -308,7 +308,7 @@ static int gf2k_connect(struct gameport 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->d.parent = &gameport->dev; input_dev->private = gf2k; input_dev->open = gf2k_open; diff -puN drivers/input/joystick/grip.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/grip.c --- a/drivers/input/joystick/grip.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/grip.c @@ -363,7 +363,7 @@ static int grip_connect(struct gameport 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->d.parent = &gameport->dev; input_dev->private = grip; input_dev->open = grip_open; diff -puN drivers/input/joystick/grip_mp.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/grip_mp.c --- a/drivers/input/joystick/grip_mp.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/grip_mp.c @@ -595,7 +595,7 @@ static int register_slot(int slot, struc 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->d.parent = &grip->gameport->dev; input_dev->private = grip; input_dev->open = grip_open; diff -puN drivers/input/joystick/guillemot.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/guillemot.c --- a/drivers/input/joystick/guillemot.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/guillemot.c @@ -231,7 +231,7 @@ static int guillemot_connect(struct game 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->d.parent = &gameport->dev; input_dev->private = guillemot; input_dev->open = guillemot_open; diff -puN drivers/input/joystick/magellan.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/magellan.c --- a/drivers/input/joystick/magellan.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/magellan.c @@ -170,7 +170,7 @@ static int magellan_connect(struct serio input_dev->id.vendor = SERIO_MAGELLAN; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = magellan; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); diff -puN drivers/input/joystick/sidewinder.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/sidewinder.c --- a/drivers/input/joystick/sidewinder.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/sidewinder.c @@ -751,7 +751,7 @@ static int sw_connect(struct gameport *g 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->d.parent = &gameport->dev; input_dev->private = sw; input_dev->open = sw_open; diff -puN drivers/input/joystick/spaceball.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/spaceball.c --- a/drivers/input/joystick/spaceball.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/spaceball.c @@ -228,7 +228,7 @@ static int spaceball_connect(struct seri input_dev->id.vendor = SERIO_SPACEBALL; input_dev->id.product = id; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = spaceball; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); diff -puN drivers/input/joystick/spaceorb.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/spaceorb.c --- a/drivers/input/joystick/spaceorb.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/spaceorb.c @@ -185,7 +185,7 @@ static int spaceorb_connect(struct serio input_dev->id.vendor = SERIO_SPACEORB; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = spaceorb; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); diff -puN drivers/input/joystick/stinger.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/stinger.c --- a/drivers/input/joystick/stinger.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/stinger.c @@ -156,7 +156,7 @@ static int stinger_connect(struct serio input_dev->id.vendor = SERIO_STINGER; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = stinger; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); diff -puN drivers/input/joystick/tmdc.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/tmdc.c --- a/drivers/input/joystick/tmdc.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/tmdc.c @@ -326,7 +326,7 @@ static int tmdc_setup_port(struct tmdc * 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->d.parent = &tmdc->gameport->dev; input_dev->private = tmdc; input_dev->open = tmdc_open; diff -puN drivers/input/joystick/twidjoy.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/twidjoy.c --- a/drivers/input/joystick/twidjoy.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/twidjoy.c @@ -207,7 +207,7 @@ static int twidjoy_connect(struct serio input_dev->id.vendor = SERIO_TWIDJOY; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = twidjoy; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); diff -puN drivers/input/joystick/warrior.c~gregkh-driver-input-device-even-more-fixes drivers/input/joystick/warrior.c --- a/drivers/input/joystick/warrior.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/joystick/warrior.c @@ -162,7 +162,7 @@ static int warrior_connect(struct serio input_dev->id.vendor = SERIO_WARRIOR; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = warrior; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); diff -puN drivers/input/keyboard/corgikbd.c~gregkh-driver-input-device-even-more-fixes drivers/input/keyboard/corgikbd.c --- a/drivers/input/keyboard/corgikbd.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/keyboard/corgikbd.c @@ -329,7 +329,7 @@ static int __init corgikbd_probe(struct input_dev->id.vendor = 0x0001; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &pdev->dev; + input_dev->d.parent = &pdev->dev; input_dev->private = corgikbd; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW); diff -puN drivers/input/keyboard/spitzkbd.c~gregkh-driver-input-device-even-more-fixes drivers/input/keyboard/spitzkbd.c --- a/drivers/input/keyboard/spitzkbd.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/keyboard/spitzkbd.c @@ -382,7 +382,7 @@ static int __init spitzkbd_probe(struct input_dev->private = spitzkbd; input_dev->name = "Spitz Keyboard"; input_dev->phys = spitzkbd->phys; - input_dev->cdev.dev = &dev->dev; + input_dev->d.parent = &dev->dev; input_dev->id.bustype = BUS_HOST; input_dev->id.vendor = 0x0001; diff -puN drivers/input/misc/ixp4xx-beeper.c~gregkh-driver-input-device-even-more-fixes drivers/input/misc/ixp4xx-beeper.c --- a/drivers/input/misc/ixp4xx-beeper.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/misc/ixp4xx-beeper.c @@ -106,7 +106,7 @@ static int __devinit ixp4xx_spkr_probe(s input_dev->id.vendor = 0x001f; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &dev->dev; + input_dev->d.parent = &dev->dev; input_dev->evbit[0] = BIT(EV_SND); input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); diff -puN drivers/input/misc/m68kspkr.c~gregkh-driver-input-device-even-more-fixes drivers/input/misc/m68kspkr.c --- a/drivers/input/misc/m68kspkr.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/misc/m68kspkr.c @@ -63,7 +63,7 @@ static int __devinit m68kspkr_probe(stru input_dev->id.vendor = 0x001f; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &dev->dev; + input_dev->d.parent = &dev->dev; input_dev->evbit[0] = BIT(EV_SND); input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); diff -puN drivers/input/misc/sparcspkr.c~gregkh-driver-input-device-even-more-fixes drivers/input/misc/sparcspkr.c --- a/drivers/input/misc/sparcspkr.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/misc/sparcspkr.c @@ -113,7 +113,7 @@ static int __devinit sparcspkr_probe(str input_dev->id.vendor = 0x001f; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->cdev.dev = dev; + input_dev->d.parent = dev; input_dev->evbit[0] = BIT(EV_SND); input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); diff -puN drivers/input/mouse/vsxxxaa.c~gregkh-driver-input-device-even-more-fixes drivers/input/mouse/vsxxxaa.c --- a/drivers/input/mouse/vsxxxaa.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/mouse/vsxxxaa.c @@ -512,7 +512,7 @@ vsxxxaa_connect (struct serio *serio, st input_dev->name = mouse->name; input_dev->phys = mouse->phys; input_dev->id.bustype = BUS_RS232; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = mouse; set_bit (EV_KEY, input_dev->evbit); /* We have buttons */ diff -puN drivers/input/touchscreen/corgi_ts.c~gregkh-driver-input-device-even-more-fixes drivers/input/touchscreen/corgi_ts.c --- a/drivers/input/touchscreen/corgi_ts.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/touchscreen/corgi_ts.c @@ -297,7 +297,7 @@ static int __init corgits_probe(struct p input_dev->id.vendor = 0x0001; input_dev->id.product = 0x0002; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &pdev->dev; + input_dev->d.parent = &pdev->dev; input_dev->private = corgi_ts; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); diff -puN drivers/input/touchscreen/elo.c~gregkh-driver-input-device-even-more-fixes drivers/input/touchscreen/elo.c --- a/drivers/input/touchscreen/elo.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/touchscreen/elo.c @@ -226,7 +226,7 @@ static int elo_connect(struct serio *ser input_dev->id.vendor = SERIO_ELO; input_dev->id.product = elo->id; input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); diff -puN drivers/input/touchscreen/h3600_ts_input.c~gregkh-driver-input-device-even-more-fixes drivers/input/touchscreen/h3600_ts_input.c --- a/drivers/input/touchscreen/h3600_ts_input.c~gregkh-driver-input-device-even-more-fixes +++ a/drivers/input/touchscreen/h3600_ts_input.c @@ -371,7 +371,7 @@ static int h3600ts_connect(struct serio input_dev->id.vendor = SERIO_H3600; input_dev->id.product = 0x0666; /* FIXME !!! We can ask the hardware */ input_dev->id.version = 0x0100; - input_dev->cdev.dev = &serio->dev; + input_dev->d.parent = &serio->dev; input_dev->private = ts; input_dev->event = h3600ts_event; _