7 files changed, 27 insertions, 23 deletions

diff --git a/drivers/input/evbug.c b/drivers/input/evbug.c
index 07358fb51b82..1d8ce7a1ec30 100644
--- a/drivers/input/evbug.c
+++ b/drivers/input/evbug.c
@@ -42,10 +42,12 @@ static char evbug_name[] = "evbug";
 
 static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
-        printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", handle->dev->phys, type, code, value);
+        printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n",
+                handle->dev->phys, type, code, value);
 }
 
-static struct input_handle *evbug_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
+static struct input_handle *evbug_connect(struct input_handler *handler, struct input_dev *dev,
+                                          const struct input_device_id *id)
 {
         struct input_handle *handle;
 
@@ -72,7 +74,7 @@ static void evbug_disconnect(struct input_handle *handle)
         kfree(handle);
 }
 
-static struct input_device_id evbug_ids[] = {
+static const struct input_device_id evbug_ids[] = {
         { .driver_info = 1 },   /* Matches all devices */
         { },                    /* Terminating zero entry */
 };
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 12c7ab876c34..154e423167b9 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -601,7 +601,7 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon
 }
 #endif
 
-static struct file_operations evdev_fops = {
+static const struct file_operations evdev_fops = {
         .owner =        THIS_MODULE,
         .read =         evdev_read,
         .write =        evdev_write,
@@ -616,7 +616,8 @@ static struct file_operations evdev_fops = {
         .flush =        evdev_flush
 };
 
-static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
+static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev,
+                                          const struct input_device_id *id)
 {
         struct evdev *evdev;
         struct class_device *cdev;
@@ -675,7 +676,7 @@ static void evdev_disconnect(struct input_handle *handle)
                 evdev_free(evdev);
 }
 
-static struct input_device_id evdev_ids[] = {
+static const struct input_device_id evdev_ids[] = {
         { .driver_info = 1 },   /* Matches all devices */
         { },                    /* Terminating zero entry */
 };
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1c71dd6fe5cd..4954c790ccb1 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -313,7 +313,8 @@ static void input_link_handle(struct input_handle *handle)
                 if (i != NBITS(max)) \
                         continue;
 
-static struct input_device_id *input_match_device(struct input_device_id *id, struct input_dev *dev)
+static const struct input_device_id *input_match_device(const struct input_device_id *id,
+                                                        struct input_dev *dev)
 {
         int i;
 
@@ -935,7 +936,7 @@ int input_register_device(struct input_dev *dev)
         static atomic_t input_no = ATOMIC_INIT(0);
         struct input_handle *handle;
         struct input_handler *handler;
-        struct input_device_id *id;
+        const struct input_device_id *id;
         const char *path;
         int error;
 
@@ -1050,7 +1051,7 @@ void input_register_handler(struct input_handler *handler)
 {
         struct input_dev *dev;
         struct input_handle *handle;
-        struct input_device_id *id;
+        const struct input_device_id *id;
 
         if (!handler)
                 return;
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index d67157513bf7..033e3aac92a3 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -451,7 +451,7 @@ static int joydev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
         }
 }
 
-static struct file_operations joydev_fops = {
+static const struct file_operations joydev_fops = {
         .owner =        THIS_MODULE,
         .read =         joydev_read,
         .write =        joydev_write,
@@ -465,7 +465,8 @@ static struct file_operations joydev_fops = {
         .fasync =       joydev_fasync,
 };
 
-static struct input_handle *joydev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
+static struct input_handle *joydev_connect(struct input_handler *handler, struct input_dev *dev,
+                                           const struct input_device_id *id)
 {
         struct joydev *joydev;
         struct class_device *cdev;
@@ -562,7 +563,7 @@ static void joydev_disconnect(struct input_handle *handle)
                 joydev_free(joydev);
 }
 
-static struct input_device_id joydev_blacklist[] = {
+static const struct input_device_id joydev_blacklist[] = {
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
                 .evbit = { BIT(EV_KEY) },
@@ -571,7 +572,7 @@ static struct input_device_id joydev_blacklist[] = {
         { }     /* Terminating entry */
 };
 
-static struct input_device_id joydev_ids[] = {
+static const struct input_device_id joydev_ids[] = {
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
                 .evbit = { BIT(EV_ABS) },
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 1f851acab30d..cd02f1b62b66 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -614,7 +614,7 @@ static unsigned int mousedev_poll(struct file *file, poll_table *wait)
                 (list->mousedev->exist ? 0 : (POLLHUP | POLLERR));
 }
 
-static struct file_operations mousedev_fops = {
+static const struct file_operations mousedev_fops = {
         .owner =        THIS_MODULE,
         .read =         mousedev_read,
         .write =        mousedev_write,
@@ -624,7 +624,8 @@ static struct file_operations mousedev_fops = {
         .fasync =       mousedev_fasync,
 };
 
-static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
+static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev,
+                                             const struct input_device_id *id)
 {
         struct mousedev *mousedev;
         struct class_device *cdev;
@@ -688,7 +689,7 @@ static void mousedev_disconnect(struct input_handle *handle)
         }
 }
 
-static struct input_device_id mousedev_ids[] = {
+static const struct input_device_id mousedev_ids[] = {
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_RELBIT,
                 .evbit = { BIT(EV_KEY) | BIT(EV_REL) },
diff --git a/drivers/input/power.c b/drivers/input/power.c
index 51a519e24b6d..75d018759cd5 100644
--- a/drivers/input/power.c
+++ b/drivers/input/power.c
@@ -98,7 +98,7 @@ static void power_event(struct input_handle *handle, unsigned int type,
 
 static struct input_handle *power_connect(struct input_handler *handler,
                                           struct input_dev *dev,
-                                          struct input_device_id *id)
+                                          const struct input_device_id *id)
 {
         struct input_handle *handle;
 
@@ -120,7 +120,7 @@ static void power_disconnect(struct input_handle *handle)
         kfree(handle);
 }
 
-static struct input_device_id power_ids[] = {
+static const struct input_device_id power_ids[] = {
         {
                 .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
                 .evbit = { BIT(EV_KEY) },
diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 00e3929c6288..162ee08223a9 100644
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -135,8 +135,6 @@ struct tsdev_list {
 #define TS_GET_CAL      _IOR(IOC_H3600_TS_MAGIC, 10, struct ts_calibration)
 #define TS_SET_CAL      _IOW(IOC_H3600_TS_MAGIC, 11, struct ts_calibration)
 
-static struct input_handler tsdev_handler;
-
 static struct tsdev *tsdev_table[TSDEV_MINORS/2];
 
 static int tsdev_fasync(int fd, struct file *file, int on)
@@ -263,7 +261,7 @@ static int tsdev_ioctl(struct inode *inode, struct file *file,
         return retval;
 }
 
-static struct file_operations tsdev_fops = {
+static const struct file_operations tsdev_fops = {
         .owner =        THIS_MODULE,
         .open =         tsdev_open,
         .release =      tsdev_release,
@@ -370,7 +368,7 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,
 
 static struct input_handle *tsdev_connect(struct input_handler *handler,
                                           struct input_dev *dev,
-                                          struct input_device_id *id)
+                                          const struct input_device_id *id)
 {
         struct tsdev *tsdev;
         struct class_device *cdev;
@@ -443,7 +441,7 @@ static void tsdev_disconnect(struct input_handle *handle)
                 tsdev_free(tsdev);
 }
 
-static struct input_device_id tsdev_ids[] = {
+static const struct input_device_id tsdev_ids[] = {
         {
               .flags    = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_RELBIT,
               .evbit    = { BIT(EV_KEY) | BIT(EV_REL) },