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

Commit 68c2a160 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: remove cruft that was needed for transition to sysfs 



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

drivers/input/input.c

+0 −10
Original line number Diff line number Diff line
@@ -906,7 +906,6 @@ struct input_dev *input_allocate_device(void) 


	dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);

	if (dev) {

		dev->dynalloc = 1;

		dev->cdev.class = &input_class;

		class_device_initialize(&dev->cdev);

		mutex_init(&dev->mutex);
@@ -942,13 +941,6 @@ int input_register_device(struct input_dev *dev) 
	const char *path;

	int error;



	if (!dev->dynalloc) {

		printk(KERN_WARNING "input: device %s is statically allocated, will not register\n"

			"Please convert to input_allocate_device() or contact dtor_core@ameritech.net\n",

			dev->name ? dev->name : "<Unknown>");

		return -EINVAL;

	}



	set_bit(EV_SYN, dev->evbit);



	/*
@@ -964,10 +956,8 @@ int input_register_device(struct input_dev *dev) 
		dev->rep[REP_PERIOD] = 33;

	}



	INIT_LIST_HEAD(&dev->h_list);

	list_add_tail(&dev->node, &input_dev_list);



	dev->cdev.class = &input_class;

	snprintf(dev->cdev.class_id, sizeof(dev->cdev.class_id),

		 "input%ld", (unsigned long) atomic_inc_return(&input_no) - 1);

include/linux/input.h

+0 −9
Original line number Diff line number Diff line
@@ -978,9 +978,6 @@ struct input_dev { 
	unsigned int users;



	struct class_device cdev;

	struct device *dev;	/* will be removed soon */



	int dynalloc;	/* temporarily */



	struct list_head	h_list;

	struct list_head	node;
@@ -1093,12 +1090,6 @@ struct input_handle { 
#define to_handle(n) container_of(n,struct input_handle,d_node)

#define to_handle_h(n) container_of(n,struct input_handle,h_node)



static inline void init_input_dev(struct input_dev *dev)

{

	INIT_LIST_HEAD(&dev->h_list);

	INIT_LIST_HEAD(&dev->node);

}



struct input_dev *input_allocate_device(void);

void input_free_device(struct input_dev *dev);