maple: Kill useless private_data pointer.

[linux-2.6] / drivers / input / keyboard / lkkbd.c

diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 3d4d0a0ede28333bb3bc7b12ae24bcd7bd116e2e..4730ef35c732dbc1210fb2a5b0adc3e4551b6caf 100644 (file)
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -64,7 +64,6 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/input.h>
@@ -515,7 +514,7 @@ static int
 lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
                int value)
 {
-       struct lkkbd *lk = dev->private;
+       struct lkkbd *lk = input_get_drvdata (dev);
        unsigned char leds_on = 0;
        unsigned char leds_off = 0;
 
@@ -539,11 +538,11 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
                        switch (code) {
                                case SND_CLICK:
                                        if (value == 0) {
-                                               DBG ("%s: Deactivating key clicks\n", __FUNCTION__);
+                                               DBG ("%s: Deactivating key clicks\n", __func__);
                                                lk->serio->write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
                                                lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
                                        } else {
-                                               DBG ("%s: Activating key clicks\n", __FUNCTION__);
+                                               DBG ("%s: Activating key clicks\n", __func__);
                                                lk->serio->write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
                                                lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume));
                                                lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
@@ -561,7 +560,7 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
 
                default:
                        printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n",
-                                       __FUNCTION__, type, code, value);
+                                       __func__, type, code, value);
        }
 
        return -1;
@@ -666,9 +665,10 @@ lkkbd_connect (struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_LKKBD;
        input_dev->id.product = 0;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
+       input_dev->dev.parent = &serio->dev;
        input_dev->event = lkkbd_event;
-       input_dev->private = lk;
+
+       input_set_drvdata (input_dev, lk);
 
        set_bit (EV_KEY, input_dev->evbit);
        set_bit (EV_LED, input_dev->evbit);