USB: Onetouch - switch to using input_dev->dev.parent
In preparation for struct class_device -> struct device input core conversion, switch to using input_dev->dev.parent when specifying device position in sysfs tree. Also, do not access input_dev->private directly, use helpers. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
57a21c1b92
commit
09b7002d68
|
@ -84,7 +84,7 @@ resubmit:
|
|||
|
||||
static int usb_onetouch_open(struct input_dev *dev)
|
||||
{
|
||||
struct usb_onetouch *onetouch = dev->private;
|
||||
struct usb_onetouch *onetouch = input_get_drvdata(dev);
|
||||
|
||||
onetouch->is_open = 1;
|
||||
onetouch->irq->dev = onetouch->udev;
|
||||
|
@ -98,7 +98,7 @@ static int usb_onetouch_open(struct input_dev *dev)
|
|||
|
||||
static void usb_onetouch_close(struct input_dev *dev)
|
||||
{
|
||||
struct usb_onetouch *onetouch = dev->private;
|
||||
struct usb_onetouch *onetouch = input_get_drvdata(dev);
|
||||
|
||||
usb_kill_urb(onetouch->irq);
|
||||
onetouch->is_open = 0;
|
||||
|
@ -185,13 +185,14 @@ int onetouch_connect_input(struct us_data *ss)
|
|||
input_dev->name = onetouch->name;
|
||||
input_dev->phys = onetouch->phys;
|
||||
usb_to_input_id(udev, &input_dev->id);
|
||||
input_dev->cdev.dev = &udev->dev;
|
||||
input_dev->dev.parent = &udev->dev;
|
||||
|
||||
set_bit(EV_KEY, input_dev->evbit);
|
||||
set_bit(ONETOUCH_BUTTON, input_dev->keybit);
|
||||
clear_bit(0, input_dev->keybit);
|
||||
|
||||
input_dev->private = onetouch;
|
||||
input_set_drvdata(input_dev, onetouch);
|
||||
|
||||
input_dev->open = usb_onetouch_open;
|
||||
input_dev->close = usb_onetouch_close;
|
||||
|
||||
|
|
Loading…
Reference in a new issue