Skip to content

Commit

Permalink
Input: drivers/input/touchscreen - don't access dev->private directly
Browse files Browse the repository at this point in the history 
Use input_get_drvdata() and input_set_drvdata() instead.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Apr 12, 2007
1 parent 0ca1804 commit 40b9b0b
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 13 deletions.
1 change: 0 additions & 1 deletion drivers/input/touchscreen/corgi_ts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ static int __init corgits_probe(struct platform_device *pdev)
input_dev->id.product = 0x0002;
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &pdev->dev;
input_dev->private = corgi_ts;

input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
input_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
Expand Down
1 change: 0 additions & 1 deletion drivers/input/touchscreen/elo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
init_completion(&elo->cmd_done);
snprintf(elo->phys, sizeof(elo->phys), "%s/input0", serio->phys);

input_dev->private = elo;
input_dev->name = "Elo Serial TouchScreen";
input_dev->phys = elo->phys;
input_dev->id.bustype = BUS_RS232;
Expand Down
1 change: 0 additions & 1 deletion drivers/input/touchscreen/gunze.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ static int gunze_connect(struct serio *serio, struct serio_driver *drv)
gunze->dev = input_dev;
snprintf(gunze->phys, sizeof(serio->phys), "%s/input0", serio->phys);

input_dev->private = gunze;
input_dev->name = "Gunze AHL-51S TouchScreen";
input_dev->phys = gunze->phys;
input_dev->id.bustype = BUS_RS232;
Expand Down
7 changes: 4 additions & 3 deletions drivers/input/touchscreen/h3600_ts_input.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ enum flite_pwr {
unsigned int h3600_flite_power(struct input_dev *dev, enum flite_pwr pwr)
{
unsigned char brightness = (pwr == FLITE_PWR_OFF) ? 0 : flite_brightness;
struct h3600_dev *ts = dev->private;
struct h3600_dev *ts = input_get_drvdata(dev);

/* Must be in this order */
ts->serio->write(ts->serio, 1);
Expand Down Expand Up @@ -260,7 +260,7 @@ static int h3600ts_event(struct input_dev *dev, unsigned int type,
unsigned int code, int value)
{
#if 0
struct h3600_dev *ts = dev->private;
struct h3600_dev *ts = input_get_drvdata(dev);

switch (type) {
case EV_LED: {
Expand Down Expand Up @@ -368,7 +368,8 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
input_dev->id.product = 0x0666; /* FIXME !!! We can ask the hardware */
input_dev->id.version = 0x0100;
input_dev->cdev.dev = &serio->dev;
input_dev->private = ts;

input_set_drvdata(input_dev, ts);

input_dev->event = h3600ts_event;

Expand Down
1 change: 0 additions & 1 deletion drivers/input/touchscreen/mtouch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ static int mtouch_connect(struct serio *serio, struct serio_driver *drv)
mtouch->dev = input_dev;
snprintf(mtouch->phys, sizeof(mtouch->phys), "%s/input0", serio->phys);

input_dev->private = mtouch;
input_dev->name = "MicroTouch Serial TouchScreen";
input_dev->phys = mtouch->phys;
input_dev->id.bustype = BUS_RS232;
Expand Down
1 change: 0 additions & 1 deletion drivers/input/touchscreen/penmount.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv)
pm->dev = input_dev;
snprintf(pm->phys, sizeof(pm->phys), "%s/input0", serio->phys);

input_dev->private = pm;
input_dev->name = "Penmount Serial TouchScreen";
input_dev->phys = pm->phys;
input_dev->id.bustype = BUS_RS232;
Expand Down
1 change: 0 additions & 1 deletion drivers/input/touchscreen/touchright.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ static int tr_connect(struct serio *serio, struct serio_driver *drv)
tr->dev = input_dev;
snprintf(tr->phys, sizeof(tr->phys), "%s/input0", serio->phys);

input_dev->private = tr;
input_dev->name = "Touchright Serial TouchScreen";
input_dev->phys = tr->phys;
input_dev->id.bustype = BUS_RS232;
Expand Down
1 change: 0 additions & 1 deletion drivers/input/touchscreen/touchwin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ static int tw_connect(struct serio *serio, struct serio_driver *drv)
tw->dev = input_dev;
snprintf(tw->phys, sizeof(tw->phys), "%s/input0", serio->phys);

input_dev->private = tw;
input_dev->name = "Touchwindow Serial TouchScreen";
input_dev->phys = tw->phys;
input_dev->id.bustype = BUS_RS232;
Expand Down
7 changes: 4 additions & 3 deletions drivers/input/touchscreen/ucb1400_ts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)

static int ucb1400_ts_open(struct input_dev *idev)
{
struct ucb1400 *ucb = idev->private;
struct ucb1400 *ucb = input_get_drvdata(idev);
int ret = 0;

BUG_ON(ucb->ts_task);
Expand All @@ -385,7 +385,7 @@ static int ucb1400_ts_open(struct input_dev *idev)

static void ucb1400_ts_close(struct input_dev *idev)
{
struct ucb1400 *ucb = idev->private;
struct ucb1400 *ucb = input_get_drvdata(idev);

if (ucb->ts_task)
kthread_stop(ucb->ts_task);
Expand Down Expand Up @@ -507,7 +507,8 @@ static int ucb1400_ts_probe(struct device *dev)
}
printk(KERN_DEBUG "UCB1400: found IRQ %d\n", ucb->irq);

idev->private = ucb;
input_set_drvdata(idev, ucb);

idev->cdev.dev = dev;
idev->name = "UCB1400 touchscreen interface";
idev->id.vendor = ucb1400_reg_read(ucb, AC97_VENDOR_ID1);
Expand Down

0 comments on commit 40b9b0b

Please sign in to comment.