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

Commit 7791bdae authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: drivers/usb/input - 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 373f9713

drivers/usb/input/acecad.c

+4 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void usb_acecad_irq(struct urb *urb) 


static int usb_acecad_open(struct input_dev *dev)

{

	struct usb_acecad *acecad = dev->private;

	struct usb_acecad *acecad = input_get_drvdata(dev);



	acecad->irq->dev = acecad->usbdev;

	if (usb_submit_urb(acecad->irq, GFP_KERNEL))
@@ -122,7 +122,7 @@ static int usb_acecad_open(struct input_dev *dev) 


static void usb_acecad_close(struct input_dev *dev)

{

	struct usb_acecad *acecad = dev->private;

	struct usb_acecad *acecad = input_get_drvdata(dev);



	usb_kill_urb(acecad->irq);

}
@@ -186,7 +186,8 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ 
	input_dev->phys = acecad->phys;

	usb_to_input_id(dev, &input_dev->id);

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

	input_dev->private = acecad;



	input_set_drvdata(input_dev, acecad);



	input_dev->open = usb_acecad_open;

	input_dev->close = usb_acecad_close;

drivers/usb/input/aiptek.c

+5 −3
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ MODULE_DEVICE_TABLE(usb, aiptek_ids); 
 */

static int aiptek_open(struct input_dev *inputdev)

{

	struct aiptek *aiptek = inputdev->private;

	struct aiptek *aiptek = input_get_drvdata(inputdev);



	aiptek->urb->dev = aiptek->usbdev;

	if (usb_submit_urb(aiptek->urb, GFP_KERNEL) != 0)
@@ -812,7 +812,7 @@ static int aiptek_open(struct input_dev *inputdev) 
 */

static void aiptek_close(struct input_dev *inputdev)

{

	struct aiptek *aiptek = inputdev->private;

	struct aiptek *aiptek = input_get_drvdata(inputdev);



	usb_kill_urb(aiptek->urb);

}
@@ -2045,7 +2045,9 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	inputdev->phys = aiptek->features.usbPath;

	usb_to_input_id(usbdev, &inputdev->id);

	inputdev->cdev.dev = &intf->dev;

	inputdev->private = aiptek;



	input_set_drvdata(inputdev, aiptek);



	inputdev->open = aiptek_open;

	inputdev->close = aiptek_close;

drivers/usb/input/appletouch.c

+4 −3
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static void atp_complete(struct urb* urb) 


static int atp_open(struct input_dev *input)

{

	struct atp *dev = input->private;

	struct atp *dev = input_get_drvdata(input);



	if (usb_submit_urb(dev->urb, GFP_ATOMIC))

		return -EIO;
@@ -477,7 +477,7 @@ static int atp_open(struct input_dev *input) 


static void atp_close(struct input_dev *input)

{

	struct atp *dev = input->private;

	struct atp *dev = input_get_drvdata(input);



	usb_kill_urb(dev->urb);

	dev->open = 0;
@@ -586,7 +586,8 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id 
	usb_to_input_id(dev->udev, &input_dev->id);

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



	input_dev->private = dev;

	input_set_drvdata(input_dev, dev);



	input_dev->open = atp_open;

	input_dev->close = atp_close;

drivers/usb/input/ati_remote.c

+4 −3
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static void ati_remote_dump(unsigned char *data, unsigned int len) 
 */

static int ati_remote_open(struct input_dev *inputdev)

{

	struct ati_remote *ati_remote = inputdev->private;

	struct ati_remote *ati_remote = input_get_drvdata(inputdev);



	/* On first open, submit the read urb which was set up previously. */

	ati_remote->irq_urb->dev = ati_remote->udev;
@@ -336,7 +336,7 @@ static int ati_remote_open(struct input_dev *inputdev) 
 */

static void ati_remote_close(struct input_dev *inputdev)

{

	struct ati_remote *ati_remote = inputdev->private;

	struct ati_remote *ati_remote = input_get_drvdata(inputdev);



	usb_kill_urb(ati_remote->irq_urb);

}
@@ -653,7 +653,8 @@ static void ati_remote_input_init(struct ati_remote *ati_remote) 
		if (ati_remote_tbl[i].type == EV_KEY)

			set_bit(ati_remote_tbl[i].code, idev->keybit);



	idev->private = ati_remote;

	input_set_drvdata(idev, ati_remote);



	idev->open = ati_remote_open;

	idev->close = ati_remote_close;

drivers/usb/input/ati_remote2.c

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static struct usb_driver ati_remote2_driver = { 


static int ati_remote2_open(struct input_dev *idev)

{

	struct ati_remote2 *ar2 = idev->private;

	struct ati_remote2 *ar2 = input_get_drvdata(idev);

	int r;



	r = usb_submit_urb(ar2->urb[0], GFP_KERNEL);
@@ -153,7 +153,7 @@ static int ati_remote2_open(struct input_dev *idev) 


static void ati_remote2_close(struct input_dev *idev)

{

	struct ati_remote2 *ar2 = idev->private;

	struct ati_remote2 *ar2 = input_get_drvdata(idev);



	usb_kill_urb(ar2->urb[0]);

	usb_kill_urb(ar2->urb[1]);
@@ -344,7 +344,7 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2) 
		return -ENOMEM;



	ar2->idev = idev;

	idev->private = ar2;

	input_set_drvdata(idev, ar2);



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

	idev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT);