aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/intel-mid-touch.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-07-18 17:09:05 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-07-18 17:10:41 -0700
commite449edbb91decd0260105fadd4f5fcc3ce170e01 (patch)
tree6b95a5554d47bff1c31417cf822c9bced934d3fd /drivers/input/touchscreen/intel-mid-touch.c
parentdc3e8247eb90655c0ff01ce03bdf3aa5868f1cde (diff)
Input: intel-mid-touch - remove pointless checking for variable 'found'
The implementation does break from the for loop after we assign 'i' to variable 'found'. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/intel-mid-touch.c')
-rw-r--r--drivers/input/touchscreen/intel-mid-touch.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/input/touchscreen/intel-mid-touch.c b/drivers/input/touchscreen/intel-mid-touch.c
index 66c96bfc552..327695268e0 100644
--- a/drivers/input/touchscreen/intel-mid-touch.c
+++ b/drivers/input/touchscreen/intel-mid-touch.c
@@ -448,15 +448,11 @@ static int __devinit mrstouch_read_pmic_id(uint *vendor, uint *rev)
*/
static int __devinit mrstouch_chan_parse(struct mrstouch_dev *tsdev)
{
- int err, i, found;
+ int found = 0;
+ int err, i;
u8 r8;
- found = -1;
-
for (i = 0; i < MRSTOUCH_MAX_CHANNELS; i++) {
- if (found >= 0)
- break;
-
err = intel_scu_ipc_ioread8(PMICADDR0 + i, &r8);
if (err)
return err;
@@ -466,16 +462,15 @@ static int __devinit mrstouch_chan_parse(struct mrstouch_dev *tsdev)
break;
}
}
- if (found < 0)
- return 0;
if (tsdev->vendor == PMIC_VENDOR_FS) {
- if (found && found > (MRSTOUCH_MAX_CHANNELS - 18))
+ if (found > MRSTOUCH_MAX_CHANNELS - 18)
return -ENOSPC;
} else {
- if (found && found > (MRSTOUCH_MAX_CHANNELS - 4))
+ if (found > MRSTOUCH_MAX_CHANNELS - 4)
return -ENOSPC;
}
+
return found;
}