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

Commit e9c8862f authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: remove accept method from input_dev 



This method used to enforce exclusive access to iforce devices,
but presenlty there are no known users of this method.

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

drivers/input/evdev.c

+0 −4
Original line number Diff line number Diff line
@@ -127,14 +127,10 @@ static int evdev_open(struct inode * inode, struct file * file) 
{

	struct evdev_list *list;

	int i = iminor(inode) - EVDEV_MINOR_BASE;

	int accept_err;



	if (i >= EVDEV_MINORS || !evdev_table[i] || !evdev_table[i]->exist)

		return -ENODEV;



	if ((accept_err = input_accept_process(&(evdev_table[i]->handle), file)))

		return accept_err;



	if (!(list = kzalloc(sizeof(struct evdev_list), GFP_KERNEL)))

		return -ENOMEM;

drivers/input/input.c

+0 −9
Original line number Diff line number Diff line
@@ -197,15 +197,6 @@ static void input_repeat_key(unsigned long data) 
		mod_timer(&dev->timer, jiffies + msecs_to_jiffies(dev->rep[REP_PERIOD]));

}



int input_accept_process(struct input_handle *handle, struct file *file)

{

	if (handle->dev->accept)

		return handle->dev->accept(handle->dev, file);



	return 0;

}

EXPORT_SYMBOL(input_accept_process);



int input_grab_device(struct input_handle *handle)

{

	if (handle->dev->grab)

include/linux/input.h

+0 −2
Original line number Diff line number Diff line
@@ -893,7 +893,6 @@ struct input_dev { 


	int (*open)(struct input_dev *dev);

	void (*close)(struct input_dev *dev);

	int (*accept)(struct input_dev *dev, struct file *file);

	int (*flush)(struct input_dev *dev, struct file *file);

	int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);

	int (*upload_effect)(struct input_dev *dev, struct ff_effect *effect);
@@ -1030,7 +1029,6 @@ void input_release_device(struct input_handle *); 
int input_open_device(struct input_handle *);

void input_close_device(struct input_handle *);



int input_accept_process(struct input_handle *handle, struct file *file);

int input_flush_device(struct input_handle* handle, struct file* file);



void input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value);