diff options
Diffstat (limited to 'drivers/usb/input/wacom_sys.c')
-rw-r--r-- | drivers/usb/input/wacom_sys.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c index 48988e63ebec..7793ffbf5256 100644 --- a/drivers/usb/input/wacom_sys.c +++ b/drivers/usb/input/wacom_sys.c | |||
@@ -122,7 +122,7 @@ void wacom_input_sync(void *wcombo) | |||
122 | 122 | ||
123 | static int wacom_open(struct input_dev *dev) | 123 | static int wacom_open(struct input_dev *dev) |
124 | { | 124 | { |
125 | struct wacom *wacom = dev->private; | 125 | struct wacom *wacom = input_get_drvdata(dev); |
126 | 126 | ||
127 | wacom->irq->dev = wacom->usbdev; | 127 | wacom->irq->dev = wacom->usbdev; |
128 | if (usb_submit_urb(wacom->irq, GFP_KERNEL)) | 128 | if (usb_submit_urb(wacom->irq, GFP_KERNEL)) |
@@ -133,7 +133,7 @@ static int wacom_open(struct input_dev *dev) | |||
133 | 133 | ||
134 | static void wacom_close(struct input_dev *dev) | 134 | static void wacom_close(struct input_dev *dev) |
135 | { | 135 | { |
136 | struct wacom *wacom = dev->private; | 136 | struct wacom *wacom = input_get_drvdata(dev); |
137 | 137 | ||
138 | usb_kill_urb(wacom->irq); | 138 | usb_kill_urb(wacom->irq); |
139 | } | 139 | } |
@@ -231,7 +231,9 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
231 | usb_to_input_id(dev, &input_dev->id); | 231 | usb_to_input_id(dev, &input_dev->id); |
232 | 232 | ||
233 | input_dev->cdev.dev = &intf->dev; | 233 | input_dev->cdev.dev = &intf->dev; |
234 | input_dev->private = wacom; | 234 | |
235 | input_set_drvdata(input_dev, wacom); | ||
236 | |||
235 | input_dev->open = wacom_open; | 237 | input_dev->open = wacom_open; |
236 | input_dev->close = wacom_close; | 238 | input_dev->close = wacom_close; |
237 | 239 | ||