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

Commit b356872f authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: drivers/input/keyboard - 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 8715c1cf

drivers/input/keyboard/aaed2000_kbd.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void aaedkbd_work(void *data) 


static int aaedkbd_open(struct input_dev *indev)

{

	struct aaedkbd *aaedkbd = indev->private;

	struct aaedkbd *aaedkbd = input_get_drvdata(indev);



	schedule_delayed_work(&aaedkbd->workq, msecs_to_jiffies(SCAN_INTERVAL));
@@ -106,7 +106,7 @@ static int aaedkbd_open(struct input_dev *indev) 


static void aaedkbd_close(struct input_dev *indev)

{

	struct aaedkbd *aaedkbd = indev->private;

	struct aaedkbd *aaedkbd = input_get_drvdata(indev);



	cancel_delayed_work(&aaedkbd->workq);

	flush_scheduled_work();
@@ -142,7 +142,7 @@ static int __devinit aaedkbd_probe(struct platform_device *pdev) 
	input_dev->id.product = 0x0001;

	input_dev->id.version = 0x0100;

	input_dev->cdev.dev = &pdev->dev;

	input_dev->private = aaedkbd;

	input_set_drvdata(input_dev, aaedkbd);



	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);

	input_dev->keycode = aaedkbd->keycode;

drivers/input/keyboard/atkbd.c

+3 −2
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ static void atkbd_event_work(struct work_struct *work) 


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

{

	struct atkbd *atkbd = dev->private;

	struct atkbd *atkbd = input_get_drvdata(dev);



	if (!atkbd->write)

		return -1;
@@ -883,9 +883,10 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd) 
	input_dev->id.product = atkbd->translated ? 1 : atkbd->set;

	input_dev->id.version = atkbd->id;

	input_dev->event = atkbd_event;

	input_dev->private = atkbd;

	input_dev->cdev.dev = &atkbd->ps2dev.serio->dev;



	input_set_drvdata(input_dev, atkbd);



	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_MSC);



	if (atkbd->write) {

drivers/input/keyboard/corgikbd.c

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ static int __init corgikbd_probe(struct platform_device *pdev) 
	input_dev->id.product = 0x0001;

	input_dev->id.version = 0x0100;

	input_dev->cdev.dev = &pdev->dev;

	input_dev->private = corgikbd;



	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);

	input_dev->keycode = corgikbd->keycode;

drivers/input/keyboard/gpio_keys.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) 
	input->name = pdev->name;

	input->phys = "gpio-keys/input0";

	input->cdev.dev = &pdev->dev;

	input->private = pdata;



	input->id.bustype = BUS_HOST;

	input->id.vendor = 0x0001;

drivers/input/keyboard/hil_kbd.c

+0 −2
Original line number Diff line number Diff line
@@ -269,8 +269,6 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv) 
	if (!kbd->dev)

		goto bail0;



	kbd->dev->private = kbd;



	if (serio_open(serio, drv))

		goto bail1;