Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults()

This allows alps_identify() to override these settings based on the
device characteristics, if it is ever necessary.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Tested-by: Dave Turvene <dturvene@dahetral.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index fe45687cf65ad5b8288e8a3723f3a38424377ae3..2221a00b25d33df18fc0eabc7acf434714a6c5d2 100644 (file)
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1190,14 +1190,10 @@ static int alps_absolute_mode_v3(struct psmouse *psmouse)
 
 static int alps_hw_init_v3(struct psmouse *psmouse)
 {
-       struct alps_data *priv = psmouse->private;
        struct ps2dev *ps2dev = &psmouse->ps2dev;
        int reg_val;
        unsigned char param[4];
 
-       priv->nibble_commands = alps_v3_nibble_commands;
-       priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-
        if (alps_enter_command_mode(psmouse, NULL))
                goto error;
 
@@ -1343,13 +1339,9 @@ static int alps_absolute_mode_v4(struct psmouse *psmouse)
 
 static int alps_hw_init_v4(struct psmouse *psmouse)
 {
-       struct alps_data *priv = psmouse->private;
        struct ps2dev *ps2dev = &psmouse->ps2dev;
        unsigned char param[4];
 
-       priv->nibble_commands = alps_v4_nibble_commands;
-       priv->addr_command = PSMOUSE_CMD_DISABLE;
-
        if (alps_enter_command_mode(psmouse, NULL))
                goto error;
 
@@ -1431,11 +1423,15 @@ static void alps_set_defaults(struct alps_data *priv)
                priv->hw_init = alps_hw_init_v3;
                priv->process_packet = alps_process_packet_v3;
                priv->set_abs_params = alps_set_abs_params_mt;
+               priv->nibble_commands = alps_v3_nibble_commands;
+               priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
                break;
        case ALPS_PROTO_V4:
                priv->hw_init = alps_hw_init_v4;
                priv->process_packet = alps_process_packet_v4;
                priv->set_abs_params = alps_set_abs_params_mt;
+               priv->nibble_commands = alps_v4_nibble_commands;
+               priv->addr_command = PSMOUSE_CMD_DISABLE;
                break;
        }
 }