diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-05 03:30:26 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-05 03:43:43 -0400 |
commit | dd0d5443da02b091636e967407805f0b7712fd44 (patch) | |
tree | 3b92ca97c4aee14d573bc091b3957e47d7a9105b /drivers/input/mouse | |
parent | c46dd1eb9a4f1b8c1bb597a75199e3d34fb7b43b (diff) |
Input: serio - don't use serio->write() directly
We have a nice wrapper for that.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r-- | drivers/input/mouse/hil_ptr.c | 32 | ||||
-rw-r--r-- | drivers/input/mouse/vsxxxaa.c | 8 |
2 files changed, 20 insertions, 20 deletions
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c index 3263ce083bf0..cd12c2d8fa0b 100644 --- a/drivers/input/mouse/hil_ptr.c +++ b/drivers/input/mouse/hil_ptr.c | |||
@@ -273,28 +273,28 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver) | |||
273 | init_MUTEX_LOCKED(&ptr->sem); | 273 | init_MUTEX_LOCKED(&ptr->sem); |
274 | 274 | ||
275 | /* Get device info. MLC driver supplies devid/status/etc. */ | 275 | /* Get device info. MLC driver supplies devid/status/etc. */ |
276 | serio->write(serio, 0); | 276 | serio_write(serio, 0); |
277 | serio->write(serio, 0); | 277 | serio_write(serio, 0); |
278 | serio->write(serio, HIL_PKT_CMD >> 8); | 278 | serio_write(serio, HIL_PKT_CMD >> 8); |
279 | serio->write(serio, HIL_CMD_IDD); | 279 | serio_write(serio, HIL_CMD_IDD); |
280 | down(&ptr->sem); | 280 | down(&ptr->sem); |
281 | 281 | ||
282 | serio->write(serio, 0); | 282 | serio_write(serio, 0); |
283 | serio->write(serio, 0); | 283 | serio_write(serio, 0); |
284 | serio->write(serio, HIL_PKT_CMD >> 8); | 284 | serio_write(serio, HIL_PKT_CMD >> 8); |
285 | serio->write(serio, HIL_CMD_RSC); | 285 | serio_write(serio, HIL_CMD_RSC); |
286 | down(&ptr->sem); | 286 | down(&ptr->sem); |
287 | 287 | ||
288 | serio->write(serio, 0); | 288 | serio_write(serio, 0); |
289 | serio->write(serio, 0); | 289 | serio_write(serio, 0); |
290 | serio->write(serio, HIL_PKT_CMD >> 8); | 290 | serio_write(serio, HIL_PKT_CMD >> 8); |
291 | serio->write(serio, HIL_CMD_RNM); | 291 | serio_write(serio, HIL_CMD_RNM); |
292 | down(&ptr->sem); | 292 | down(&ptr->sem); |
293 | 293 | ||
294 | serio->write(serio, 0); | 294 | serio_write(serio, 0); |
295 | serio->write(serio, 0); | 295 | serio_write(serio, 0); |
296 | serio->write(serio, HIL_PKT_CMD >> 8); | 296 | serio_write(serio, HIL_PKT_CMD >> 8); |
297 | serio->write(serio, HIL_CMD_EXD); | 297 | serio_write(serio, HIL_CMD_EXD); |
298 | down(&ptr->sem); | 298 | down(&ptr->sem); |
299 | 299 | ||
300 | up(&ptr->sem); | 300 | up(&ptr->sem); |
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c index 404eedd5ffa2..70111443678e 100644 --- a/drivers/input/mouse/vsxxxaa.c +++ b/drivers/input/mouse/vsxxxaa.c | |||
@@ -384,11 +384,11 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse) | |||
384 | printk (KERN_NOTICE "%s on %s: Forceing standard packet format, " | 384 | printk (KERN_NOTICE "%s on %s: Forceing standard packet format, " |
385 | "incremental streaming mode and 72 samples/sec\n", | 385 | "incremental streaming mode and 72 samples/sec\n", |
386 | mouse->name, mouse->phys); | 386 | mouse->name, mouse->phys); |
387 | mouse->serio->write (mouse->serio, 'S'); /* Standard format */ | 387 | serio_write (mouse->serio, 'S'); /* Standard format */ |
388 | mdelay (50); | 388 | mdelay (50); |
389 | mouse->serio->write (mouse->serio, 'R'); /* Incremental */ | 389 | serio_write (mouse->serio, 'R'); /* Incremental */ |
390 | mdelay (50); | 390 | mdelay (50); |
391 | mouse->serio->write (mouse->serio, 'L'); /* 72 samples/sec */ | 391 | serio_write (mouse->serio, 'L'); /* 72 samples/sec */ |
392 | } | 392 | } |
393 | 393 | ||
394 | static void | 394 | static void |
@@ -532,7 +532,7 @@ vsxxxaa_connect (struct serio *serio, struct serio_driver *drv) | |||
532 | * Request selftest. Standard packet format and differential | 532 | * Request selftest. Standard packet format and differential |
533 | * mode will be requested after the device ID'ed successfully. | 533 | * mode will be requested after the device ID'ed successfully. |
534 | */ | 534 | */ |
535 | serio->write (serio, 'T'); /* Test */ | 535 | serio_write (serio, 'T'); /* Test */ |
536 | 536 | ||
537 | err = input_register_device (input_dev); | 537 | err = input_register_device (input_dev); |
538 | if (err) | 538 | if (err) |