Input: iforce - move command completion handling to serio code

Continue teasing apart protocol-specific bits from core into transport
modules. This time move RS232-specific command completion handling
from core to iforce-serio module.

Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index e677562efc9ade4034096df28dd7086522652905..8a9a152bb595819b4641c1597ad0735046527740 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -134,13 +134,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
        struct input_dev *dev = iforce->dev;
        int i;
 
-#ifdef CONFIG_JOYSTICK_IFORCE_232
-       if (HI(iforce->expect_packet) == HI(cmd)) {
-               iforce->expect_packet = 0;
-               iforce->ecmd = cmd;
-               memcpy(iforce->edata, data, IFORCE_MAX_LENGTH);
-       }
-#endif
        wake_up(&iforce->wait);
 
        if (!iforce->type)

diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c
index fa45ce425d4781dd610a743aa2ae258dfd40bb95..eca2f6eca7f0543abc37575eb3ba31a0b7b0b69c 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-serio.c
+++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -130,7 +130,17 @@ static irqreturn_t iforce_serio_irq(struct serio *serio,
        }
 
        if (iforce->idx == iforce->len) {
-               iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data);
+               u16 cmd = (iforce->id << 8) | iforce->idx;
+
+               /* Handle command completion */
+               if (HI(iforce->expect_packet) == HI(cmd)) {
+                       iforce->expect_packet = 0;
+                       iforce->ecmd = cmd;
+                       memcpy(iforce->edata, iforce->data, IFORCE_MAX_LENGTH);
+               }
+
+               iforce_process_packet(iforce, cmd, iforce->data);
+
                iforce->pkt = 0;
                iforce->id  = 0;
                iforce->len = 0;