mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

Input: constify input core

Browse source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2006-09-14 01:31:59 -04:00
parent 5206c0d5ec
commit 66e6611883
9 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/char/keyboard.c
View file

@ -1285,7 +1285,7 @@ static void kbd_event(struct input_handle *handle, unsigned int event_type,
*/ */
static struct input_handle *kbd_connect(struct input_handler *handler, static struct input_handle *kbd_connect(struct input_handler *handler,
struct input_dev *dev, struct input_dev *dev,
struct input_device_id *id) const struct input_device_id *id)
{ {
struct input_handle *handle; struct input_handle *handle;
int i; int i;
@ -1334,7 +1334,7 @@ static void kbd_start(struct input_handle *handle)
tasklet_enable(&keyboard_tasklet); tasklet_enable(&keyboard_tasklet);
} }
static struct input_device_id kbd_ids[] = { static const struct input_device_id kbd_ids[] = {
{ {
.flags = INPUT_DEVICE_ID_MATCH_EVBIT, .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
.evbit = { BIT(EV_KEY) }, .evbit = { BIT(EV_KEY) },

8
drivers/input/evbug.c
View file

@ -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) 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; struct input_handle *handle;
@ -72,7 +74,7 @@ static void evbug_disconnect(struct input_handle *handle)
kfree(handle); kfree(handle);
} }
static struct input_device_id evbug_ids[] = { static const struct input_device_id evbug_ids[] = {
{ .driver_info = 1 }, /* Matches all devices */ { .driver_info = 1 }, /* Matches all devices */
{ }, /* Terminating zero entry */ { }, /* Terminating zero entry */
}; };

7
drivers/input/evdev.c
View file

@ -601,7 +601,7 @@ static long evdev_ioctl_compat(struct file *file, unsigned int cmd, unsigned lon
} }
#endif #endif
static struct file_operations evdev_fops = { static const struct file_operations evdev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = evdev_read, .read = evdev_read,
.write = evdev_write, .write = evdev_write,
@ -616,7 +616,8 @@ static struct file_operations evdev_fops = {
.flush = evdev_flush .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 evdev *evdev;
struct class_device *cdev; struct class_device *cdev;
@ -675,7 +676,7 @@ static void evdev_disconnect(struct input_handle *handle)
evdev_free(evdev); evdev_free(evdev);
} }
static struct input_device_id evdev_ids[] = { static const struct input_device_id evdev_ids[] = {
{ .driver_info = 1 }, /* Matches all devices */ { .driver_info = 1 }, /* Matches all devices */
{ }, /* Terminating zero entry */ { }, /* Terminating zero entry */
}; };

7
drivers/input/input.c
View file

@ -313,7 +313,8 @@ static void input_link_handle(struct input_handle *handle)
if (i != NBITS(max)) \ if (i != NBITS(max)) \
continue; 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; int i;
@ -935,7 +936,7 @@ int input_register_device(struct input_dev *dev)
static atomic_t input_no = ATOMIC_INIT(0); static atomic_t input_no = ATOMIC_INIT(0);
struct input_handle *handle; struct input_handle *handle;
struct input_handler *handler; struct input_handler *handler;
struct input_device_id *id; const struct input_device_id *id;
const char *path; const char *path;
int error; int error;
@ -1050,7 +1051,7 @@ void input_register_handler(struct input_handler *handler)
{ {
struct input_dev *dev; struct input_dev *dev;
struct input_handle *handle; struct input_handle *handle;
struct input_device_id *id; const struct input_device_id *id;
if (!handler) if (!handler)
return; return;

9
drivers/input/joydev.c
View file

@ -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, .owner = THIS_MODULE,
.read = joydev_read, .read = joydev_read,
.write = joydev_write, .write = joydev_write,
@ -465,7 +465,8 @@ static struct file_operations joydev_fops = {
.fasync = joydev_fasync, .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 joydev *joydev;
struct class_device *cdev; struct class_device *cdev;
@ -562,7 +563,7 @@ static void joydev_disconnect(struct input_handle *handle)
joydev_free(joydev); 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, .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
.evbit = { BIT(EV_KEY) }, .evbit = { BIT(EV_KEY) },
@ -571,7 +572,7 @@ static struct input_device_id joydev_blacklist[] = {
{ } /* Terminating entry */ { } /* 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, .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
.evbit = { BIT(EV_ABS) }, .evbit = { BIT(EV_ABS) },

7
drivers/input/mousedev.c
View file

@ -614,7 +614,7 @@ static unsigned int mousedev_poll(struct file *file, poll_table *wait)
(list->mousedev->exist ? 0 : (POLLHUP | POLLERR)); (list->mousedev->exist ? 0 : (POLLHUP | POLLERR));
} }
static struct file_operations mousedev_fops = { static const struct file_operations mousedev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read = mousedev_read, .read = mousedev_read,
.write = mousedev_write, .write = mousedev_write,
@ -624,7 +624,8 @@ static struct file_operations mousedev_fops = {
.fasync = mousedev_fasync, .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 mousedev *mousedev;
struct class_device *cdev; 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, .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_RELBIT,
.evbit = { BIT(EV_KEY) | BIT(EV_REL) }, .evbit = { BIT(EV_KEY) | BIT(EV_REL) },

4
drivers/input/power.c
View file

@ -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, static struct input_handle *power_connect(struct input_handler *handler,
struct input_dev *dev, struct input_dev *dev,
struct input_device_id *id) const struct input_device_id *id)
{ {
struct input_handle *handle; struct input_handle *handle;
@ -120,7 +120,7 @@ static void power_disconnect(struct input_handle *handle)
kfree(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, .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
.evbit = { BIT(EV_KEY) }, .evbit = { BIT(EV_KEY) },

8
drivers/input/tsdev.c
View file

@ -135,8 +135,6 @@ struct tsdev_list {
#define TS_GET_CAL _IOR(IOC_H3600_TS_MAGIC, 10, struct ts_calibration) #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) #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 struct tsdev *tsdev_table[TSDEV_MINORS/2];
static int tsdev_fasync(int fd, struct file *file, int on) 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; return retval;
} }
static struct file_operations tsdev_fops = { static const struct file_operations tsdev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = tsdev_open, .open = tsdev_open,
.release = tsdev_release, .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, static struct input_handle *tsdev_connect(struct input_handler *handler,
struct input_dev *dev, struct input_dev *dev,
struct input_device_id *id) const struct input_device_id *id)
{ {
struct tsdev *tsdev; struct tsdev *tsdev;
struct class_device *cdev; struct class_device *cdev;
@ -443,7 +441,7 @@ static void tsdev_disconnect(struct input_handle *handle)
tsdev_free(tsdev); 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, .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_RELBIT,
.evbit = { BIT(EV_KEY) | BIT(EV_REL) }, .evbit = { BIT(EV_KEY) | BIT(EV_REL) },

10
include/linux/input.h
View file

@ -1059,16 +1059,16 @@ struct input_handler {
void *private; void *private;
void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value); void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
struct input_handle* (*connect)(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id); struct input_handle* (*connect)(struct input_handler *handler, struct input_dev *dev, const struct input_device_id *id);
void (*disconnect)(struct input_handle *handle); void (*disconnect)(struct input_handle *handle);
void (*start)(struct input_handle *handle); void (*start)(struct input_handle *handle);
const struct file_operations *fops; const struct file_operations *fops;
int minor; int minor;
char *name; const char *name;
struct input_device_id *id_table; const struct input_device_id *id_table;
struct input_device_id *blacklist; const struct input_device_id *blacklist;
struct list_head h_list; struct list_head h_list;
struct list_head node; struct list_head node;
@ -1079,7 +1079,7 @@ struct input_handle {
void *private; void *private;
int open; int open;
char *name; const char *name;
struct input_dev *dev; struct input_dev *dev;
struct input_handler *handler; struct input_handler *handler;