Commit deec586d authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Dmitry Torokhov
Browse files

Input: tsc2007 - rename function tsc2007_calculate_pressure 



Rename tsc2007_calculate_pressure to tsc2007_calculate_resistance because
that is what it does.

Signed-off-by: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c61ebe83

drivers/input/touchscreen/tsc2007.h

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ struct tsc2007 { 
};



int tsc2007_xfer(struct tsc2007 *tsc, u8 cmd);

u32 tsc2007_calculate_pressure(struct tsc2007 *tsc,

					struct ts_event *tc);

u32 tsc2007_calculate_resistance(struct tsc2007 *tsc, struct ts_event *tc);

bool tsc2007_is_pen_down(struct tsc2007 *ts);



#if IS_ENABLED(CONFIG_TOUCHSCREEN_TSC2007_IIO)

drivers/input/touchscreen/tsc2007_core.c

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void tsc2007_read_values(struct tsc2007 *tsc, struct ts_event *tc) 
	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;
@@ -77,7 +77,7 @@ u32 tsc2007_calculate_pressure(struct tsc2007 *tsc, struct ts_event *tc) 
		tc->x = 0;



	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->x;

		rt *= tsc->x_plate_ohms;
@@ -125,7 +125,7 @@ static irqreturn_t tsc2007_soft_irq(int irq, void *handle) 
		tsc2007_read_values(ts, &tc);

		mutex_unlock(&ts->mlock);



		rt = tsc2007_calculate_pressure(ts, &tc);

		rt = tsc2007_calculate_resistance(ts, &tc);



		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) {

			dev_dbg(&ts->client->dev,

				"DOWN point(%4d,%4d), pressure (%4u)\n",

				"DOWN point(%4d,%4d), resistance (%4u)\n",

				tc.x, tc.y, rt);



			input_report_key(input, BTN_TOUCH, 1);

drivers/input/touchscreen/tsc2007_iio.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int tsc2007_read_raw(struct iio_dev *indio_dev, 
		tc.x = tsc2007_xfer(tsc, READ_X);

		tc.z1 = tsc2007_xfer(tsc, READ_Z1);

		tc.z2 = tsc2007_xfer(tsc, READ_Z2);

		*val = tsc2007_calculate_pressure(tsc, &tc);

		*val = tsc2007_calculate_resistance(tsc, &tc);

		break;

	}

	case 6:

CRA Git | Maintained and supported by SUSTech CRA and CCSE