This patch change alps_identify() function code so it can be called also without
priv parameter which is useful for alps_detect(). Instead passing dummy value
now alps_identify() accept also NULL value and skip filling priv data. It is
useless for alps_detect() and it will speed up detection of alps devices.
Signed-off-by: Pali Rohár <pali.ro...@gmail.com>
---
drivers/input/mouse/alps.c | 114 +++++++++++++++++++++++++++-----------------
1 file changed, 71 insertions(+), 43 deletions(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 5603870..0176425 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2162,8 +2162,7 @@ static void alps_set_defaults(struct alps_data *priv)
}
}
-static int alps_match_table(struct psmouse *psmouse, struct alps_data *priv,
- unsigned char *e7, unsigned char *ec)
+static const struct alps_model_info *alps_match_table(unsigned char *e7,
unsigned char *ec)
{
const struct alps_model_info *model;
int i;
@@ -2174,24 +2173,49 @@ static int alps_match_table(struct psmouse *psmouse,
struct alps_data *priv,
if (!memcmp(e7, model->signature, sizeof(model->signature)) &&
(!model->command_mode_resp ||
model->command_mode_resp == ec[2])) {
+ return model;
+ }
+ }
- priv->proto_version = model->proto_version;
- alps_set_defaults(priv);
+ return NULL;
+}
- priv->flags = model->flags;
- priv->byte0 = model->byte0;
- priv->mask0 = model->mask0;
+static inline bool alps_match_v5(unsigned char *e7, unsigned char *ec)
+{
+ return (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&
+ ec[0] == 0x73 && (ec[1] == 0x01 || ec[1] == 0x02));
+}
- return 0;
- }
- }
+static inline bool alps_match_v7(unsigned char *e7, unsigned char *ec)
+{
+ return (ec[0] == 0x88 &&
+ ((ec[1] & 0xf0) == 0xb0 || (ec[1] & 0xf0) == 0xc0));
+}
- return -EINVAL;
+static inline bool alps_match_rushmore_v3(unsigned char *e7, unsigned char *ec)
+{
+ return (ec[0] == 0x88 && ec[1] == 0x08);
+}
+
+static inline bool alps_match_v3(unsigned char *e7, unsigned char *ec)
+{
+ return (ec[0] == 0x88 && ec[1] == 0x07 &&
+ ec[2] >= 0x90 && ec[2] <= 0x9d);
+}
+
+static inline bool alps_match_any(unsigned char *e7, unsigned char *ec)
+{
+ return (alps_match_table(e7, ec) ||
+ alps_match_v5(e7, ec) ||
+ alps_match_v7(e7, ec) ||
+ alps_match_rushmore_v3(e7, ec) ||
+ alps_match_v3(e7, ec));
}
static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
{
unsigned char e6[4], e7[4], ec[4];
+ const struct alps_model_info *model;
/*
* First try "E6 report".
@@ -2217,40 +2241,46 @@ static int alps_identify(struct psmouse *psmouse,
struct alps_data *priv)
alps_exit_command_mode(psmouse))
return -EIO;
- /* Save the Firmware version */
- memcpy(priv->fw_ver, ec, 3);
+ if (priv) {
- if (alps_match_table(psmouse, priv, e7, ec) == 0) {
- return 0;
- } else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&
- ec[0] == 0x73 && (ec[1] == 0x01 || ec[1] == 0x02)) {
- priv->proto_version = ALPS_PROTO_V5;
- alps_set_defaults(priv);
+ /* Save the Firmware version */
+ memcpy(priv->fw_ver, ec, 3);
- return 0;
- } else if (ec[0] == 0x88 &&
- ((ec[1] & 0xf0) == 0xb0 || (ec[1] & 0xf0) == 0xc0)) {
- priv->proto_version = ALPS_PROTO_V7;
- alps_set_defaults(priv);
-
- return 0;
- } else if (ec[0] == 0x88 && ec[1] == 0x08) {
- priv->proto_version = ALPS_PROTO_V3;
- alps_set_defaults(priv);
+ if ((model = alps_match_table(e7, ec))) {
+ priv->proto_version = model->proto_version;
+ alps_set_defaults(priv);
+ priv->flags = model->flags;
+ priv->byte0 = model->byte0;
+ priv->mask0 = model->mask0;
+ return 0;
+ } else if (alps_match_v5(e7, ec)) {
+ priv->proto_version = ALPS_PROTO_V5;
+ alps_set_defaults(priv);
+ return 0;
+ } else if (alps_match_v7(e7, ec)) {
+ priv->proto_version = ALPS_PROTO_V7;
+ alps_set_defaults(priv);
+ return 0;
+ } else if (alps_match_rushmore_v3(e7, ec)) {
+ priv->proto_version = ALPS_PROTO_V3;
+ alps_set_defaults(priv);
+ priv->hw_init = alps_hw_init_rushmore_v3;
+ priv->decode_fields = alps_decode_rushmore;
+ priv->x_bits = 16;
+ priv->y_bits = 12;
+ priv->flags |= ALPS_IS_RUSHMORE;
+ return 0;
+ } else if (alps_match_v3(e7, ec)) {
+ priv->proto_version = ALPS_PROTO_V3;
+ alps_set_defaults(priv);
+ return 0;
+ }
- priv->hw_init = alps_hw_init_rushmore_v3;
- priv->decode_fields = alps_decode_rushmore;
- priv->x_bits = 16;
- priv->y_bits = 12;
- priv->flags |= ALPS_IS_RUSHMORE;
+ } else {
- return 0;
- } else if (ec[0] == 0x88 && ec[1] == 0x07 &&
- ec[2] >= 0x90 && ec[2] <= 0x9d) {
- priv->proto_version = ALPS_PROTO_V3;
- alps_set_defaults(priv);
+ if (alps_match_any(e7, ec))
+ return 0;
- return 0;
}
psmouse_dbg(psmouse,
@@ -2427,9 +2457,7 @@ init_fail:
int alps_detect(struct psmouse *psmouse, bool set_properties)
{
- struct alps_data dummy;
-
- if (alps_identify(psmouse, &dummy) < 0)
+ if (alps_identify(psmouse, NULL) < 0)
return -1;
if (set_properties) {
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
