mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-20 16:46:23 +08:00
Input: ucb1x00 - do not access input_dev->private directly
Use input_get_drvdata() and input_set_drvdata() helpers to do that. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Pavel Machek <pavel@ucw.cz>
This commit is contained in:
parent
b23c9e386c
commit
26be5a509a
@ -292,7 +292,7 @@ static void ucb1x00_ts_irq(int idx, void *id)
|
|||||||
|
|
||||||
static int ucb1x00_ts_open(struct input_dev *idev)
|
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;
|
int ret = 0;
|
||||||
|
|
||||||
BUG_ON(ts->rtask);
|
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)
|
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)
|
if (ts->rtask)
|
||||||
kthread_stop(ts->rtask);
|
kthread_stop(ts->rtask);
|
||||||
@ -381,7 +381,6 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
|
|||||||
ts->idev = idev;
|
ts->idev = idev;
|
||||||
ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
|
ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
|
||||||
|
|
||||||
idev->private = ts;
|
|
||||||
idev->name = "Touchscreen panel";
|
idev->name = "Touchscreen panel";
|
||||||
idev->id.product = ts->ucb->id;
|
idev->id.product = ts->ucb->id;
|
||||||
idev->open = ucb1x00_ts_open;
|
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_Y, idev->absbit);
|
||||||
__set_bit(ABS_PRESSURE, idev->absbit);
|
__set_bit(ABS_PRESSURE, idev->absbit);
|
||||||
|
|
||||||
|
input_set_drvdata(idev, ts);
|
||||||
|
|
||||||
err = input_register_device(idev);
|
err = input_register_device(idev);
|
||||||
if (err)
|
if (err)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
Loading…
Reference in New Issue
Block a user