From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Donohue Subject: [PATCH v6 2/3] Input: ALPS - Clean up TrackStick handling for SS5 hardware Date: Thu, 24 Nov 2016 09:25:52 -0500 Message-ID: <1479997553-25877-3-git-send-email-linux-kernel@PaulSD.com> References: <201611111459.12642@pali> <1479997553-25877-1-git-send-email-linux-kernel@PaulSD.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from Lepton.TopQuark.net ([168.235.66.66]:40457 "EHLO Mail2.TopQuark.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965566AbcKXO0d (ORCPT ); Thu, 24 Nov 2016 09:26:33 -0500 In-Reply-To: <1479997553-25877-1-git-send-email-linux-kernel@PaulSD.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-input@vger.kernel.org Cc: Ben Gamari , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Michal Hocko , Paul Donohue For consistency and clarity, the input_report_*() functions should be called by alps_process_packet_ss4_v2() instead of by alps_decode_ss4_v2(). Reviewed-by: Pali Roh=C3=A1r Signed-off-by: Paul Donohue --- drivers/input/mouse/alps.c | 42 +++++++++++++++++++++++++---------------= -- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index b93fe83..61d61cc 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -1267,18 +1267,12 @@ static int alps_decode_ss4_v2(struct alps_fields = *f, break; =20 case SS4_PACKET_ID_STICK: - if (!(priv->flags & ALPS_DUALPOINT)) { - psmouse_warn(psmouse, - "Rejected trackstick packet from non DualPoint device"); - } else { - int x =3D (s8)(((p[0] & 1) << 7) | (p[1] & 0x7f)); - int y =3D (s8)(((p[3] & 1) << 7) | (p[2] & 0x7f)); - int pressure =3D (s8)(p[4] & 0x7f); - - input_report_rel(priv->dev2, REL_X, x); - input_report_rel(priv->dev2, REL_Y, -y); - input_report_abs(priv->dev2, ABS_PRESSURE, pressure); - } + /* + * x, y, and pressure are decoded in + * alps_process_packet_ss4_v2() + */ + f->first_mp =3D 0; + f->is_mp =3D 0; break; =20 case SS4_PACKET_ID_IDLE: @@ -1312,6 +1306,7 @@ static void alps_process_packet_ss4_v2(struct psmou= se *psmouse) struct input_dev *dev =3D psmouse->dev; struct input_dev *dev2 =3D priv->dev2; struct alps_fields *f =3D &priv->f; + int x, y, pressure; =20 memset(f, 0, sizeof(struct alps_fields)); priv->decode_fields(f, packet, psmouse); @@ -1348,12 +1343,25 @@ static void alps_process_packet_ss4_v2(struct psm= ouse *psmouse) =20 /* Report trackstick */ if (alps_get_pkt_id_ss4_v2(packet) =3D=3D SS4_PACKET_ID_STICK) { - if (priv->flags & ALPS_DUALPOINT) { - input_report_key(dev2, BTN_LEFT, f->ts_left); - input_report_key(dev2, BTN_RIGHT, f->ts_right); - input_report_key(dev2, BTN_MIDDLE, f->ts_middle); - input_sync(dev2); + if (!(priv->flags & ALPS_DUALPOINT)) { + psmouse_warn(psmouse, + "Rejected trackstick packet from non DualPoint device"); + return; } + + x =3D (s8)(((packet[0] & 1) << 7) | (packet[1] & 0x7f)); + y =3D (s8)(((packet[3] & 1) << 7) | (packet[2] & 0x7f)); + pressure =3D (s8)(packet[4] & 0x7f); + + input_report_rel(dev2, REL_X, x); + input_report_rel(dev2, REL_Y, -y); + input_report_abs(dev2, ABS_PRESSURE, pressure); + + input_report_key(dev2, BTN_LEFT, f->ts_left); + input_report_key(dev2, BTN_RIGHT, f->ts_right); + input_report_key(dev2, BTN_MIDDLE, f->ts_middle); + + input_sync(dev2); return; } =20 --=20 2.7.4