dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Input: ads7846 - optimize order of calculating Rt in ads7846_rx() 

Alter the if expression for calculating Rt. The old implementation would
run unnecessary code when the ADS7843 device was used.

The patch also fixes the code style to kernel standard.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Hans-Christian Egtvedt 2008-07-23 14:38:27 -04:00 committed by Dmitry Torokhov
parent 494f685775
commit 9460b6529d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/input/touchscreen/ads7846.c
View File

@ -517,7 +517,9 @@ static void ads7846_rx(void *ads)
if (x == MAX_12BIT)
x = 0;
if (likely(x && z1)) {
if (ts->model == 7843) {
Rt = ts->pressure_max / 2;
} else if (likely(x && z1)) {
/* compute touch pressure resistance using equation #2 */
Rt = z2;
Rt -= z1;
@ -525,11 +527,9 @@ static void ads7846_rx(void *ads)
Rt *= ts->x_plate_ohms;
Rt /= z1;
Rt = (Rt + 2047) >> 12;
} else
} else {
Rt = 0;
if (ts->model == 7843)
Rt = ts->pressure_max / 2;
}
/* Sample found inconsistent by debouncing or pressure is beyond
* the maximum. Don't report it to user space, repeat at least