diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 01:34:33 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-12 01:34:33 -0400 |
commit | 373f9713dccc8fc8e076157001a60133455c0550 (patch) | |
tree | 509c52d79867b6614a750bba582e067db03d4419 /drivers/input/misc/uinput.c | |
parent | b356872fa48a3f6b6f187444b0ea55e6e21c3575 (diff) |
Input: drivers/input/misc - 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 'drivers/input/misc/uinput.c')
-rw-r--r-- | drivers/input/misc/uinput.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 42556232c523..031467eadd31 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c | |||
@@ -41,9 +41,7 @@ | |||
41 | 41 | ||
42 | static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) | 42 | static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) |
43 | { | 43 | { |
44 | struct uinput_device *udev; | 44 | struct uinput_device *udev = input_get_drvdata(dev); |
45 | |||
46 | udev = dev->private; | ||
47 | 45 | ||
48 | udev->buff[udev->head].type = type; | 46 | udev->buff[udev->head].type = type; |
49 | udev->buff[udev->head].code = code; | 47 | udev->buff[udev->head].code = code; |
@@ -136,7 +134,7 @@ static int uinput_dev_upload_effect(struct input_dev *dev, struct ff_effect *eff | |||
136 | request.u.upload.effect = effect; | 134 | request.u.upload.effect = effect; |
137 | request.u.upload.old = old; | 135 | request.u.upload.old = old; |
138 | 136 | ||
139 | retval = uinput_request_reserve_slot(dev->private, &request); | 137 | retval = uinput_request_reserve_slot(input_get_drvdata(dev), &request); |
140 | if (!retval) | 138 | if (!retval) |
141 | retval = uinput_request_submit(dev, &request); | 139 | retval = uinput_request_submit(dev, &request); |
142 | 140 | ||
@@ -156,7 +154,7 @@ static int uinput_dev_erase_effect(struct input_dev *dev, int effect_id) | |||
156 | request.code = UI_FF_ERASE; | 154 | request.code = UI_FF_ERASE; |
157 | request.u.effect_id = effect_id; | 155 | request.u.effect_id = effect_id; |
158 | 156 | ||
159 | retval = uinput_request_reserve_slot(dev->private, &request); | 157 | retval = uinput_request_reserve_slot(input_get_drvdata(dev), &request); |
160 | if (!retval) | 158 | if (!retval) |
161 | retval = uinput_request_submit(dev, &request); | 159 | retval = uinput_request_submit(dev, &request); |
162 | 160 | ||
@@ -274,7 +272,7 @@ static int uinput_allocate_device(struct uinput_device *udev) | |||
274 | return -ENOMEM; | 272 | return -ENOMEM; |
275 | 273 | ||
276 | udev->dev->event = uinput_dev_event; | 274 | udev->dev->event = uinput_dev_event; |
277 | udev->dev->private = udev; | 275 | input_set_drvdata(udev->dev, udev); |
278 | 276 | ||
279 | return 0; | 277 | return 0; |
280 | } | 278 | } |