aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/yealink.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-04-12 01:34:39 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-04-12 01:34:39 -0400
commit7791bdae71243050132ede7ea1558c828b69458f (patch)
treef6c3291deff0b7b8720405432245b6acf7cce218 /drivers/usb/input/yealink.c
parentInput: drivers/input/misc - don't access dev->private directly (diff)
downloadlinux-dev-7791bdae71243050132ede7ea1558c828b69458f.tar.xz
linux-dev-7791bdae71243050132ede7ea1558c828b69458f.zip
Input: drivers/usb/input - don't access dev->private directly
Use input_get_drvdata() and input_set_drvdata() instead. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to '')
-rw-r--r--drivers/usb/input/yealink.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index 688abcdf1f0f..294224e20f49 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -502,7 +502,7 @@ static int input_ev(struct input_dev *dev, unsigned int type,
static int input_open(struct input_dev *dev)
{
- struct yealink_dev *yld = dev->private;
+ struct yealink_dev *yld = input_get_drvdata(dev);
int i, ret;
dbg("%s", __FUNCTION__);
@@ -529,7 +529,7 @@ static int input_open(struct input_dev *dev)
static void input_close(struct input_dev *dev)
{
- struct yealink_dev *yld = dev->private;
+ struct yealink_dev *yld = input_get_drvdata(dev);
usb_kill_urb(yld->urb_ctl);
usb_kill_urb(yld->urb_irq);
@@ -939,7 +939,8 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
usb_to_input_id(udev, &input_dev->id);
input_dev->cdev.dev = &intf->dev;
- input_dev->private = yld;
+ input_set_drvdata(input_dev, yld);
+
input_dev->open = input_open;
input_dev->close = input_close;
/* input_dev->event = input_ev; TODO */