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

Commit 3797fec1 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: remove private member from input_dev structure 



Everyone should be using input_{get|set}_drvdata() by now.
Alias them to dev_{get|set}_drvdata() and remove ->private.

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

drivers/input/input-polldev.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void input_polled_device_work(struct work_struct *work) 


static int input_open_polled_device(struct input_dev *input)

{

	struct input_polled_dev *dev = input->private;

	struct input_polled_dev *dev = input_get_drvdata(input);

	int error;



	error = input_polldev_start_workqueue();
@@ -91,7 +91,7 @@ static int input_open_polled_device(struct input_dev *input) 


static void input_close_polled_device(struct input_dev *input)

{

	struct input_polled_dev *dev = input->private;

	struct input_polled_dev *dev = input_get_drvdata(input);



	cancel_delayed_work_sync(&dev->work);

	input_polldev_stop_workqueue();
@@ -151,10 +151,10 @@ int input_register_polled_device(struct input_polled_dev *dev) 
{

	struct input_dev *input = dev->input;



	input_set_drvdata(input, dev);

	INIT_DELAYED_WORK(&dev->work, input_polled_device_work);

	if (!dev->poll_interval)

		dev->poll_interval = 500;

	input->private = dev;

	input->open = input_open_polled_device;

	input->close = input_close_polled_device;

include/linux/input.h

+2 −6
Original line number Diff line number Diff line
@@ -1025,10 +1025,6 @@ struct ff_effect { 
 * @node: used to place the device onto input_dev_list

 */

struct input_dev {

	/* private: */

	void *private;	/* do not use */

	/* public: */



	const char *name;

	const char *phys;

	const char *uniq;
@@ -1238,12 +1234,12 @@ static inline void input_put_device(struct input_dev *dev) 


static inline void *input_get_drvdata(struct input_dev *dev)

{

	return dev->private;

	return dev_get_drvdata(&dev->dev);

}



static inline void input_set_drvdata(struct input_dev *dev, void *data)

{

	dev->private = data;

	dev_set_drvdata(&dev->dev, data);

}



int __must_check input_register_device(struct input_dev *);