Input: serio - don't use serio->write() directly

We have a nice wrapper for that.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

6 files changed, 91 insertions, 86 deletions

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index 6f356705ee3b..f732893a960e 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -280,28 +280,28 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         init_MUTEX_LOCKED(&kbd->sem);
 
         /* Get device info.  MLC driver supplies devid/status/etc. */
-        serio->write(serio, 0);
-        serio->write(serio, 0);
-        serio->write(serio, HIL_PKT_CMD >> 8);
-        serio->write(serio, HIL_CMD_IDD);
+        serio_write(serio, 0);
+        serio_write(serio, 0);
+        serio_write(serio, HIL_PKT_CMD >> 8);
+        serio_write(serio, HIL_CMD_IDD);
         down(&kbd->sem);
 
-        serio->write(serio, 0);
-        serio->write(serio, 0);
-        serio->write(serio, HIL_PKT_CMD >> 8);
-        serio->write(serio, HIL_CMD_RSC);
+        serio_write(serio, 0);
+        serio_write(serio, 0);
+        serio_write(serio, HIL_PKT_CMD >> 8);
+        serio_write(serio, HIL_CMD_RSC);
         down(&kbd->sem);
 
-        serio->write(serio, 0);
-        serio->write(serio, 0);
-        serio->write(serio, HIL_PKT_CMD >> 8);
-        serio->write(serio, HIL_CMD_RNM);
+        serio_write(serio, 0);
+        serio_write(serio, 0);
+        serio_write(serio, HIL_PKT_CMD >> 8);
+        serio_write(serio, HIL_CMD_RNM);
         down(&kbd->sem);
 
-        serio->write(serio, 0);
-        serio->write(serio, 0);
-        serio->write(serio, HIL_PKT_CMD >> 8);
-        serio->write(serio, HIL_CMD_EXD);
+        serio_write(serio, 0);
+        serio_write(serio, 0);
+        serio_write(serio, HIL_PKT_CMD >> 8);
+        serio_write(serio, HIL_CMD_EXD);
         down(&kbd->sem);
 
         up(&kbd->sem);
@@ -350,10 +350,10 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         printk(KERN_INFO "input: %s, ID: %d\n",
                 kbd->dev->name, did);
 
-        serio->write(serio, 0);
-        serio->write(serio, 0);
-        serio->write(serio, HIL_PKT_CMD >> 8);
-        serio->write(serio, HIL_CMD_EK1); /* Enable Keyswitch Autorepeat 1 */
+        serio_write(serio, 0);
+        serio_write(serio, 0);
+        serio_write(serio, HIL_PKT_CMD >> 8);
+        serio_write(serio, HIL_CMD_EK1); /* Enable Keyswitch Autorepeat 1 */
         down(&kbd->sem);
         up(&kbd->sem);
 
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 4730ef35c732..f9847e0fb553 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -525,12 +525,12 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
                         CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
                         CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
                         if (leds_on != 0) {
-                                lk->serio->write (lk->serio, LK_CMD_LED_ON);
-                                lk->serio->write (lk->serio, leds_on);
+                                serio_write (lk->serio, LK_CMD_LED_ON);
+                                serio_write (lk->serio, leds_on);
                         }
                         if (leds_off != 0) {
-                                lk->serio->write (lk->serio, LK_CMD_LED_OFF);
-                                lk->serio->write (lk->serio, leds_off);
+                                serio_write (lk->serio, LK_CMD_LED_OFF);
+                                serio_write (lk->serio, leds_off);
                         }
                         return 0;
 
@@ -539,20 +539,20 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
                                 case SND_CLICK:
                                         if (value == 0) {
                                                 DBG ("%s: Deactivating key clicks\n", __func__);
-                                                lk->serio->write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
-                                                lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
+                                                serio_write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
+                                                serio_write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
                                         } else {
                                                 DBG ("%s: Activating key clicks\n", __func__);
-                                                lk->serio->write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
-                                                lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume));
-                                                lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
-                                                lk->serio->write (lk->serio, volume_to_hw (lk->ctrlclick_volume));
+                                                serio_write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
+                                                serio_write (lk->serio, volume_to_hw (lk->keyclick_volume));
+                                                serio_write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
+                                                serio_write (lk->serio, volume_to_hw (lk->ctrlclick_volume));
                                         }
                                         return 0;
 
                                 case SND_BELL:
                                         if (value != 0)
-                                                lk->serio->write (lk->serio, LK_CMD_SOUND_BELL);
+                                                serio_write (lk->serio, LK_CMD_SOUND_BELL);
 
                                         return 0;
                         }
@@ -579,10 +579,10 @@ lkkbd_reinit (struct work_struct *work)
         unsigned char leds_off = 0;
 
         /* Ask for ID */
-        lk->serio->write (lk->serio, LK_CMD_REQUEST_ID);
+        serio_write (lk->serio, LK_CMD_REQUEST_ID);
 
         /* Reset parameters */
-        lk->serio->write (lk->serio, LK_CMD_SET_DEFAULTS);
+        serio_write (lk->serio, LK_CMD_SET_DEFAULTS);
 
         /* Set LEDs */
         CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK);
@@ -590,12 +590,12 @@ lkkbd_reinit (struct work_struct *work)
         CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK);
         CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT);
         if (leds_on != 0) {
-                lk->serio->write (lk->serio, LK_CMD_LED_ON);
-                lk->serio->write (lk->serio, leds_on);
+                serio_write (lk->serio, LK_CMD_LED_ON);
+                serio_write (lk->serio, leds_on);
         }
         if (leds_off != 0) {
-                lk->serio->write (lk->serio, LK_CMD_LED_OFF);
-                lk->serio->write (lk->serio, leds_off);
+                serio_write (lk->serio, LK_CMD_LED_OFF);
+                serio_write (lk->serio, leds_off);
         }
 
         /*
@@ -603,31 +603,31 @@ lkkbd_reinit (struct work_struct *work)
          * only work with a LK401 keyboard and grants access to
          * LAlt, RAlt, RCompose and RShift.
          */
-        lk->serio->write (lk->serio, LK_CMD_ENABLE_LK401);
+        serio_write (lk->serio, LK_CMD_ENABLE_LK401);
 
         /* Set all keys to UPDOWN mode */
         for (division = 1; division <= 14; division++)
-                lk->serio->write (lk->serio, LK_CMD_SET_MODE (LK_MODE_UPDOWN,
+                serio_write (lk->serio, LK_CMD_SET_MODE (LK_MODE_UPDOWN,