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

Commit 26be5a50 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: ucb1x00 - do not access input_dev->private directly 



Use input_get_drvdata() and input_set_drvdata() helpers to do that.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
parent b23c9e38

drivers/mfd/ucb1x00-ts.c

+4 −3
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void ucb1x00_ts_irq(int idx, void *id) 


static int ucb1x00_ts_open(struct input_dev *idev)

{

	struct ucb1x00_ts *ts = idev->private;

	struct ucb1x00_ts *ts = input_get_drvdata(idev);

	int ret = 0;



	BUG_ON(ts->rtask);
@@ -329,7 +329,7 @@ static int ucb1x00_ts_open(struct input_dev *idev) 
 */

static void ucb1x00_ts_close(struct input_dev *idev)

{

	struct ucb1x00_ts *ts = idev->private;

	struct ucb1x00_ts *ts = input_get_drvdata(idev);



	if (ts->rtask)

		kthread_stop(ts->rtask);
@@ -381,7 +381,6 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) 
	ts->idev = idev;

	ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;



	idev->private    = ts;

	idev->name       = "Touchscreen panel";

	idev->id.product = ts->ucb->id;

	idev->open       = ucb1x00_ts_open;
@@ -392,6 +391,8 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) 
	__set_bit(ABS_Y, idev->absbit);

	__set_bit(ABS_PRESSURE, idev->absbit);



	input_set_drvdata(idev, ts);



	err = input_register_device(idev);

	if (err)

		goto fail;