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

Commit 373f9713 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: drivers/input/misc - don't access dev->private directly 



Use input_get_drvdata() and input_set_drvdata() instead.

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

drivers/input/misc/ixp4xx-beeper.c

+5 −4
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void ixp4xx_spkr_control(unsigned int pin, unsigned int count) 


static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)

{

	unsigned int pin = (unsigned int) dev->private;

	unsigned int pin = (unsigned int) input_get_drvdata(input_dev);

	unsigned int count = 0;



	if (type != EV_SND)
@@ -99,7 +99,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) 
	if (!input_dev)

		return -ENOMEM;



	input_dev->private = (void *) dev->id;

	input_set_drvdata(input_dev, (void *) dev->id);



	input_dev->name = "ixp4xx beeper",

	input_dev->phys = "ixp4xx/gpio";

	input_dev->id.bustype = BUS_HOST;
@@ -136,7 +137,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) 
static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)

{

	struct input_dev *input_dev = platform_get_drvdata(dev);

	unsigned int pin = (unsigned int) input_dev->private;

	unsigned int pin = (unsigned int) input_get_drvdata(input_dev);



	input_unregister_device(input_dev);

	platform_set_drvdata(dev, NULL);
@@ -153,7 +154,7 @@ static int __devexit ixp4xx_spkr_remove(struct platform_device *dev) 
static void ixp4xx_spkr_shutdown(struct platform_device *dev)

{

	struct input_dev *input_dev = platform_get_drvdata(dev);

	unsigned int pin = (unsigned int) input_dev->private;

	unsigned int pin = (unsigned int) input_get_drvdata(input_dev);



	/* turn off the speaker */

	disable_irq(IRQ_IXP4XX_TIMER2);

drivers/input/misc/uinput.c

+4 −6
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ 


static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)

{

	struct uinput_device	*udev;



	udev = dev->private;

	struct uinput_device	*udev = input_get_drvdata(dev);



	udev->buff[udev->head].type = type;

	udev->buff[udev->head].code = code;
@@ -136,7 +134,7 @@ static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *eff 
	request.u.upload.effect = effect;

	request.u.upload.old = old;



	retval = uinput_request_reserve_slot(dev->private, &request);

	retval = uinput_request_reserve_slot(input_get_drvdata(dev), &request);

	if (!retval)

		retval = uinput_request_submit(dev, &request);
@@ -156,7 +154,7 @@ static int uinput_dev_erase_effect(struct input_dev *dev, int effect_id) 
	request.code = UI_FF_ERASE;

	request.u.effect_id = effect_id;



	retval = uinput_request_reserve_slot(dev->private, &request);

	retval = uinput_request_reserve_slot(input_get_drvdata(dev), &request);

	if (!retval)

		retval = uinput_request_submit(dev, &request);
@@ -274,7 +272,7 @@ static int uinput_allocate_device(struct uinput_device *udev) 
		return -ENOMEM;



	udev->dev->event = uinput_dev_event;

	udev->dev->private = udev;

	input_set_drvdata(udev->dev, udev);



	return 0;

}