Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 15:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Input: tsc2007 - rename function tsc2007_calculate_pressure

Browse Source 
Rename tsc2007_calculate_pressure to tsc2007_calculate_resistance because
that is what it does.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
H. Nikolaus Schaller 2017-02-22 23:49:02 -08:00 committed by Dmitry Torokhov
parent c61ebe83e7
commit deec586d4f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/touchscreen/tsc2007.h
View File

@ -85,8 +85,7 @@ struct tsc2007 {
}; };
int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd); int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd);
u32 tsc2007_calculate_pressure(struct tsc2007 *tsc, u32 tsc2007_calculate_resistance(struct tsc2007 *tsc, struct ts_event *tc);
struct ts_event *tc);
bool tsc2007_is_pen_down(struct tsc2007 *ts); bool tsc2007_is_pen_down(struct tsc2007 *ts);
#if IS_ENABLED(CONFIG_TOUCHSCREEN_TSC2007_IIO) #if IS_ENABLED(CONFIG_TOUCHSCREEN_TSC2007_IIO)

8
drivers/input/touchscreen/tsc2007_core.c
View File

@ -68,7 +68,7 @@ static void tsc2007_read_values(struct tsc2007 *tsc, struct ts_event *tc)
tsc2007_xfer(tsc, PWRDOWN); tsc2007_xfer(tsc, PWRDOWN);
} }
u32 tsc2007_calculate_pressure(struct tsc2007 *tsc, struct ts_event *tc) u32 tsc2007_calculate_resistance(struct tsc2007 *tsc, struct ts_event *tc)
{ {
u32 rt = 0; u32 rt = 0;
@ -77,7 +77,7 @@ u32 tsc2007_calculate_pressure(struct tsc2007 *tsc, struct ts_event *tc)
tc->x = 0; tc->x = 0;
if (likely(tc->x && tc->z1)) { if (likely(tc->x && tc->z1)) {
/* compute touch pressure resistance using equation #1 */ /* compute touch resistance using equation #1 */
rt = tc->z2 - tc->z1; rt = tc->z2 - tc->z1;
rt *= tc->x; rt *= tc->x;
rt *= tsc->x_plate_ohms; rt *= tsc->x_plate_ohms;
@ -125,7 +125,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)
tsc2007_read_values(ts, &tc); tsc2007_read_values(ts, &tc);
mutex_unlock(&ts->mlock); mutex_unlock(&ts->mlock);
rt = tsc2007_calculate_pressure(ts, &tc); rt = tsc2007_calculate_resistance(ts, &tc);
if (!rt && !ts->get_pendown_state) { if (!rt && !ts->get_pendown_state) {
/* /*
@ -138,7 +138,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle)
if (rt <= ts->max_rt) { if (rt <= ts->max_rt) {
dev_dbg(&ts->client->dev, dev_dbg(&ts->client->dev,
"DOWN point(%4d,%4d), pressure (%4u)\n", "DOWN point(%4d,%4d), resistance (%4u)\n",
tc.x, tc.y, rt); tc.x, tc.y, rt);
input_report_key(input, BTN_TOUCH, 1); input_report_key(input, BTN_TOUCH, 1);

2
drivers/input/touchscreen/tsc2007_iio.c
View File

@ -76,7 +76,7 @@ static int tsc2007_read_raw(struct iio_dev *indio_dev,
tc.x = tsc2007_xfer(tsc, READ_X); tc.x = tsc2007_xfer(tsc, READ_X);
tc.z1 = tsc2007_xfer(tsc, READ_Z1); tc.z1 = tsc2007_xfer(tsc, READ_Z1);
tc.z2 = tsc2007_xfer(tsc, READ_Z2); tc.z2 = tsc2007_xfer(tsc, READ_Z2);
*val = tsc2007_calculate_pressure(tsc, &tc); *val = tsc2007_calculate_resistance(tsc, &tc);
break; break;
} }
case 6: case 6: