Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[linux-2.6-omap-h63xx.git] / drivers / input / joystick / sidewinder.c

diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index e58b22c018e4af75d908b1b36e1d7de10c460e0f..2adf73f63c94dd7898d7ef1091a4c5842bb832c4 100644 (file)
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -509,7 +509,7 @@ static void sw_poll(struct gameport *gameport)
 
 static int sw_open(struct input_dev *dev)
 {
-       struct sw *sw = dev->private;
+       struct sw *sw = input_get_drvdata(dev);
 
        gameport_start_polling(sw->gameport);
        return 0;
@@ -517,7 +517,7 @@ static int sw_open(struct input_dev *dev)
 
 static void sw_close(struct input_dev *dev)
 {
-       struct sw *sw = dev->private;
+       struct sw *sw = input_get_drvdata(dev);
 
        gameport_stop_polling(sw->gameport);
 }
@@ -751,8 +751,9 @@ 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->private = sw;
+               input_dev->dev.parent = &gameport->dev;
+
+               input_set_drvdata(input_dev, sw);
 
                input_dev->open = sw_open;
                input_dev->close = sw_close;