Skip to content

Commit

Permalink
Input: ucb1x00 - do not access input_dev->private directly
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov committed Jun 4, 2007
1 parent b23c9e3 commit 26be5a5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/mfd/ucb1x00-ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 26be5a5

Please sign in to comment.