]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Input: intel-mid-touch - remove pointless checking for variable 'found'
authorAxel Lin <axel.lin@gmail.com>
Tue, 19 Jul 2011 00:09:05 +0000 (17:09 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 19 Jul 2011 00:10:41 +0000 (17:10 -0700)
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>
drivers/input/touchscreen/intel-mid-touch.c

index 66c96bfc5522d64f79298c9a2ea5a61a9ce3d1e5..327695268e06ed2413ddbb8e02e4079ed3eee231 100644 (file)
@@ -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;
 }