linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Kurtz <djkurtz@chromium.org>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Henrik Rydberg <rydberg@euromail.se>,
	Joonyoung Shim <jy0922.shim@samsung.com>,
	Nick Dyer <nick.dyer@itdev.co.uk>,
	Yufeng Shen <miletus@chromium.org>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	Olof Johansson <olof@lixom.net>,
	Benson Leung <bleung@chromium.org>,
	Daniel Kurtz <djkurtz@chromium.org>
Subject: [PATCH 20/23 v6] Input: atmel_mxt_ts - refactor reportid checking in mxt_interrupt
Date: Thu, 28 Jun 2012 21:08:21 +0800	[thread overview]
Message-ID: <1340888904-15620-21-git-send-email-djkurtz@chromium.org> (raw)
In-Reply-To: <1340888904-15620-1-git-send-email-djkurtz@chromium.org>

This small refactor is in preparation for checking more report types
in the mxt_interrupt message processing loop.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
 drivers/input/touchscreen/atmel_mxt_ts.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 48f3637..a9e0b54 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -554,6 +554,12 @@ static void mxt_input_touchevent(struct mxt_data *data,
 	input_sync(input_dev);
 }
 
+static bool mxt_is_T9_message(struct mxt_data *data, struct mxt_message *msg)
+{
+	u8 id = msg->reportid;
+	return (id >= data->T9_reportid_min && id <= data->T9_reportid_max);
+}
+
 static irqreturn_t mxt_interrupt(int irq, void *dev_id)
 {
 	struct mxt_data *data = dev_id;
@@ -561,8 +567,6 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
 	struct device *dev = &data->client->dev;
 	int id;
 	u8 reportid;
-	u8 max_reportid;
-	u8 min_reportid;
 
 	do {
 		if (mxt_read_message(data, &message)) {
@@ -572,11 +576,9 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
 
 		reportid = message.reportid;
 
-		max_reportid = data->T9_reportid_max;
-		min_reportid = data->T9_reportid_min;
-		id = reportid - min_reportid;
+		id = reportid - data->T9_reportid_min;
 
-		if (reportid >= min_reportid && reportid <= max_reportid)
+		if (mxt_is_T9_message(data, &message))
 			mxt_input_touchevent(data, &message, id);
 		else
 			mxt_dump_message(dev, &message);
-- 
1.7.7.3


  parent reply	other threads:[~2012-06-28 13:08 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-28 13:08 [PATCH 00/23 v6] cleanup atmel_mxt_ts Daniel Kurtz
2012-06-28 13:08 ` [PATCH 01/23 v6] Input: atmel_mxt_ts - derive phys from i2c client adapter Daniel Kurtz
2012-06-28 13:08 ` [PATCH 02/23 v6] Input: atmel_mxt_ts - use client name for irq Daniel Kurtz
2012-06-28 13:08 ` [PATCH 03/23 v6] Input: atmel_mxt_ts - detect OOM when creating mt slots Daniel Kurtz
2012-06-28 13:08 ` [PATCH 04/23 v6] Input: atmel_mxt_ts - warn if sysfs could not be created Daniel Kurtz
2012-07-05 17:22   ` Dmitry Torokhov
2012-07-05 19:15     ` Henrik Rydberg
2012-07-16  2:34       ` Daniel Kurtz
2012-06-28 13:08 ` [PATCH 05/23 v6] Input: atmel_mxt_ts - don't read T5 when dumping objects Daniel Kurtz
2012-06-28 13:08 ` [PATCH 06/23 v6] Input: atmel_mxt_ts - use scnprintf for object sysfs entry Daniel Kurtz
2012-06-28 13:08 ` [PATCH 07/23 v6] Input: atmel_mxt_ts - optimize reading objects in " Daniel Kurtz
2012-06-28 13:08 ` [PATCH 08/23 v6] Input: atmel_mxt_ts - print less overhead when dumping objects Daniel Kurtz
2012-06-28 13:08 ` [PATCH 09/23 v6] Input: atmel_mxt_ts - print all instances " Daniel Kurtz
2012-06-28 13:08 ` [PATCH 10/23 v6] Input: atmel_mxt_ts - return errors from i2c layer Daniel Kurtz
2012-06-28 13:08 ` [PATCH 11/23 v6] Input: atmel_mxt_ts - add variable length __mxt_write_reg Daniel Kurtz
2012-06-28 13:08 ` [PATCH 12/23 v6] Input: atmel_mxt_ts - optimize writing of object table entries Daniel Kurtz
2012-06-28 13:08 ` [PATCH 13/23 v6] Input: atmel_mxt_ts - read ID information block in one i2c transaction Daniel Kurtz
2012-06-28 13:08 ` [PATCH 14/23 v6] Input: atmel_mxt_ts - update driver ID info logging Daniel Kurtz
2012-06-28 13:08 ` [PATCH 15/23 v6] Input: atmel_mxt_ts - add sysfs entries to read fw and hw version Daniel Kurtz
2012-06-28 13:08 ` [PATCH 16/23 v6] Input: atmel_mxt_ts - simplify event reporting Daniel Kurtz
2012-06-28 13:08 ` [PATCH 17/23 v6] Input: atmel_mxt_ts - add detail to touchevent debug message Daniel Kurtz
2012-06-28 13:08 ` [PATCH 18/23 v6] Input: atmel_mxt_ts - refactor when and how object table is freed Daniel Kurtz
2012-06-28 13:08 ` [PATCH 19/23 v6] Input: atmel_mxt_ts - cache T9 reportid range when reading object table Daniel Kurtz
2012-06-28 13:08 ` Daniel Kurtz [this message]
2012-06-28 13:08 ` [PATCH 21/23 v6] Input: atmel_mxt_ts - use T9 reportid range to init number of mt slots Daniel Kurtz
2012-06-28 13:08 ` [PATCH 22/23 v6] Input: atmel_mxt_ts - send all MT-B slots in one input report Daniel Kurtz
2012-06-28 13:08 ` [PATCH 23/23 v6] Input: atmel_mxt_ts - parse T6 reports Daniel Kurtz
2012-06-29 14:23 ` [PATCH 00/23 v6] cleanup atmel_mxt_ts Henrik Rydberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340888904-15620-21-git-send-email-djkurtz@chromium.org \
    --to=djkurtz@chromium.org \
    --cc=bleung@chromium.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jy0922.shim@samsung.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miletus@chromium.org \
    --cc=nick.dyer@itdev.co.uk \
    --cc=olof@lixom.net \
    --cc=rydberg@euromail.se \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).