Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66e66118 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: constify input core 



Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 5206c0d5

drivers/char/keyboard.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

					struct input_dev *dev,

					struct input_device_id *id)

					const struct input_device_id *id)

{

	struct input_handle *handle;

	int i;
@@ -1334,7 +1334,7 @@ static void kbd_start(struct input_handle *handle) 
	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,

                .evbit = { BIT(EV_KEY) },

drivers/input/evbug.c

+5 −3
Original line number Diff line number Diff line
@@ -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 */

};

drivers/input/evdev.c

+4 −3
Original line number Diff line number Diff line
@@ -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 */

};

drivers/input/input.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

drivers/input/joydev.c

+5 −4
Original line number Diff line number Diff line
@@ -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) },