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

Commit ea9f240b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] INPUT: rename input_dev_class to input_class to be correct. 



Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b0fdfebb

drivers/input/evdev.c

+2 −2
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct 


	evdev_table[minor] = evdev;



	class_device_create(&input_dev_class, &dev->cdev,

	class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),

			dev->cdev.dev, "event%d", minor);
@@ -698,7 +698,7 @@ static void evdev_disconnect(struct input_handle *handle) 
	struct evdev *evdev = handle->private;

	struct evdev_list *list;



	class_device_destroy(&input_dev_class,

	class_device_destroy(&input_class,

			MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));

	evdev->exist = 0;

drivers/input/input.c

+7 −7
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ EXPORT_SYMBOL(input_close_device); 
EXPORT_SYMBOL(input_accept_process);

EXPORT_SYMBOL(input_flush_device);

EXPORT_SYMBOL(input_event);

EXPORT_SYMBOL_GPL(input_dev_class);

EXPORT_SYMBOL_GPL(input_class);



#define INPUT_DEVICES	256
@@ -729,8 +729,8 @@ static void input_dev_release(struct class_device *class_dev) 
	module_put(THIS_MODULE);

}



struct class input_dev_class = {

	.name			= "input_dev",

struct class input_class = {

	.name			= "input",

	.release		= input_dev_release,

};
@@ -741,7 +741,7 @@ struct input_dev *input_allocate_device(void) 
	dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);

	if (dev) {

		dev->dynalloc = 1;

		dev->cdev.class = &input_dev_class;

		dev->cdev.class = &input_class;

		class_device_initialize(&dev->cdev);

		INIT_LIST_HEAD(&dev->h_list);

		INIT_LIST_HEAD(&dev->node);
@@ -930,7 +930,7 @@ static int __init input_init(void) 
{

	int err;



	err = class_register(&input_dev_class);

	err = class_register(&input_class);

	if (err) {

		printk(KERN_ERR "input: unable to register input_dev class\n");

		return err;
@@ -949,7 +949,7 @@ static int __init input_init(void) 
	return 0;



 fail2:	input_proc_exit();

 fail1:	class_unregister(&input_dev_class);

 fail1:	class_unregister(&input_class);

	return err;

}
@@ -957,7 +957,7 @@ static void __exit input_exit(void) 
{

	input_proc_exit();

	unregister_chrdev(INPUT_MAJOR, "input");

	class_unregister(&input_dev_class);

	class_unregister(&input_class);

}



subsys_initcall(input_init);

drivers/input/joydev.c

+2 −2
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct 


	joydev_table[minor] = joydev;



	class_device_create(&input_dev_class, &dev->cdev,

	class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),

			dev->cdev.dev, "js%d", minor);
@@ -525,7 +525,7 @@ static void joydev_disconnect(struct input_handle *handle) 
	struct joydev *joydev = handle->private;

	struct joydev_list *list;



	class_device_destroy(&input_dev_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));

	class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));

	joydev->exist = 0;



	if (joydev->open) {

drivers/input/mousedev.c

+4 −4
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru 


	mousedev_table[minor] = mousedev;



	class_device_create(&input_dev_class, &dev->cdev,

	class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),

			dev->cdev.dev, "mouse%d", minor);
@@ -660,7 +660,7 @@ static void mousedev_disconnect(struct input_handle *handle) 
	struct mousedev *mousedev = handle->private;

	struct mousedev_list *list;



	class_device_destroy(&input_dev_class,

	class_device_destroy(&input_class,

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));

	mousedev->exist = 0;
@@ -734,7 +734,7 @@ static int __init mousedev_init(void) 
	mousedev_mix.exist = 1;

	mousedev_mix.minor = MOUSEDEV_MIX;



	class_device_create(&input_dev_class, NULL,

	class_device_create(&input_class, NULL,

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX), NULL, "mice");



#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -753,7 +753,7 @@ static void __exit mousedev_exit(void) 
	if (psaux_registered)

		misc_deregister(&psaux_mouse);

#endif

	class_device_destroy(&input_dev_class,

	class_device_destroy(&input_class,

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + MOUSEDEV_MIX));

	input_unregister_handler(&mousedev_handler);

}

drivers/input/tsdev.c

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static struct input_handle *tsdev_connect(struct input_handler *handler, 


	tsdev_table[minor] = tsdev;



	class_device_create(&input_dev_class, &dev->cdev,

	class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),

			dev->cdev.dev, "ts%d", minor);
@@ -421,7 +421,7 @@ static void tsdev_disconnect(struct input_handle *handle) 
	struct tsdev *tsdev = handle->private;

	struct tsdev_list *list;



	class_device_destroy(&input_dev_class,

	class_device_destroy(&input_class,

			MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));

	tsdev->exist = 0;