Merge omap-drivers

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

diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index fe12aa37393d9560c080f823182cd21b93339f8b..c71b58fe225db3a05ded9186b82ee600db734534 100644 (file)
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -60,10 +60,6 @@ MODULE_PARM_DESC(map2, "Describes second set of devices");
 module_param_array_named(map3, gc[2].args, int, &gc[2].nargs, 0);
 MODULE_PARM_DESC(map3, "Describes third set of devices");
 
-__obsolete_setup("gc=");
-__obsolete_setup("gc_2=");
-__obsolete_setup("gc_3=");
-
 /* see also gs_psx_delay parameter in PSX support section */
 
 #define GC_SNES                1
@@ -403,8 +399,6 @@ static int gc_psx_delay = GC_PSX_DELAY;
 module_param_named(psx_delay, gc_psx_delay, uint, 0);
 MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)");
 
-__obsolete_setup("gc_psx_delay=");
-
 static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y };
 static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y,
                                BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR };
@@ -597,7 +591,7 @@ static void gc_timer(unsigned long private)
 
 static int gc_open(struct input_dev *dev)
 {
-       struct gc *gc = dev->private;
+       struct gc *gc = input_get_drvdata(dev);
        int err;
 
        err = mutex_lock_interruptible(&gc->mutex);
@@ -616,7 +610,7 @@ static int gc_open(struct input_dev *dev)
 
 static void gc_close(struct input_dev *dev)
 {
-       struct gc *gc = dev->private;
+       struct gc *gc = input_get_drvdata(dev);
 
        mutex_lock(&gc->mutex);
        if (!--gc->used) {
@@ -652,7 +646,8 @@ static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = pad_type;
        input_dev->id.version = 0x0100;
-       input_dev->private = gc;
+
+       input_set_drvdata(input_dev, gc);
 
        input_dev->open = gc_open;
        input_dev->close = gc_close;