From patchwork Tue Jun 23 19:17:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 6662911 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9501B9F1C1 for ; Tue, 23 Jun 2015 19:20:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B7F0A20652 for ; Tue, 23 Jun 2015 19:20:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 891B020672 for ; Tue, 23 Jun 2015 19:20:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933635AbbFWTSd (ORCPT ); Tue, 23 Jun 2015 15:18:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34605 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933236AbbFWTRq (ORCPT ); Tue, 23 Jun 2015 15:17:46 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 339E336B1F6; Tue, 23 Jun 2015 19:17:46 +0000 (UTC) Received: from t540p.bos.redhat.com (dhcp-25-39.bos.redhat.com [10.18.25.39]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5NJHZLv016968; Tue, 23 Jun 2015 15:17:45 -0400 From: Benjamin Tissoires To: Dmitry Torokhov , Andrew Duggan , Christopher Heiny , Allie Xiong Cc: Stephen Chandler Paul , benjamin.tissoires@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Benjamin Tissoires Subject: [PATCH 09/11] Input: synaptics-rmi4 - f11: clean up rmi_f11_finger_handler Date: Tue, 23 Jun 2015 15:17:28 -0400 Message-Id: <1435087050-11444-10-git-send-email-benjamin.tissoires@redhat.com> In-Reply-To: <1435087050-11444-1-git-send-email-benjamin.tissoires@redhat.com> References: <1435087050-11444-1-git-send-email-benjamin.tissoires@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP abs_bit and rel_bits should not be computed at each iteration of the for loop. finger_press_count is unused. Break out rmi_f11_parse_finger_state in its own function. Signed-off-by: Benjamin Tissoires Reviewed-by: Andrew Duggan --- drivers/input/rmi4/rmi_f11.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c index 061530a..77a18aa 100644 --- a/drivers/input/rmi4/rmi_f11.c +++ b/drivers/input/rmi4/rmi_f11.c @@ -695,43 +695,36 @@ static void rmi_f11_abs_pos_report(struct f11_data *f11, input_mt_sync(input); } +static inline u8 rmi_f11_parse_finger_state(const u8 *f_state, u8 n_finger) +{ + return (f_state[n_finger / 4] >> (2 * (n_finger % 4))) & + FINGER_STATE_MASK; +} + static void rmi_f11_finger_handler(struct f11_data *f11, struct f11_2d_sensor *sensor, unsigned long *irq_bits, int num_irq_regs) { const u8 *f_state = sensor->data.f_state; u8 finger_state; - u8 finger_pressed_count; u8 i; - int rel_bits; - int abs_bits; + int abs_bits = bitmap_and(f11->result_bits, irq_bits, f11->abs_mask, + num_irq_regs * 8); + int rel_bits = bitmap_and(f11->result_bits, irq_bits, f11->rel_mask, + num_irq_regs * 8); - for (i = 0, finger_pressed_count = 0; i < sensor->nbr_fingers; i++) { + for (i = 0; i < sensor->nbr_fingers; i++) { /* Possible of having 4 fingers per f_statet register */ - finger_state = (f_state[i / 4] >> (2 * (i % 4))) & - FINGER_STATE_MASK; - switch (finger_state) { - case F11_RESERVED: + finger_state = rmi_f11_parse_finger_state(f_state, i); + if (finger_state == F11_RESERVED) { pr_err("Invalid finger state[%d]: 0x%02x", i, finger_state); continue; - - case F11_PRESENT: - case F11_INACCURATE: - finger_pressed_count++; - break; - - case F11_NO_FINGER: - break; } - abs_bits = bitmap_and(f11->result_bits, irq_bits, f11->abs_mask, - num_irq_regs * 8); if (abs_bits) rmi_f11_abs_pos_report(f11, sensor, finger_state, i); - rel_bits = bitmap_and(f11->result_bits, irq_bits, f11->rel_mask, - num_irq_regs * 8); if (rel_bits) rmi_f11_rel_pos_report(sensor, i); }