From: Dmitry Torokhov Date: Sat, 24 Aug 2024 05:50:41 +0000 (-0700) Subject: Input: zforce_ts - remove assert/deassert wrappers X-Git-Tag: v6.12-rc1~65^2~2^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a5180c619ed52f9e05767c78bf7edb04304d9bd;p=thirdparty%2Fkernel%2Flinux.git Input: zforce_ts - remove assert/deassert wrappers The wrappers are extremely simple, used once, and do not bring much value. Remove them. Tested-by: Andreas Kemnade # Tolino Shine2HD Link: https://lore.kernel.org/r/20240824055047.1706392-18-dmitry.torokhov@gmail.com Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c index 116f3aa6350c1..5df4f9e8fb2ed 100644 --- a/drivers/input/touchscreen/zforce_ts.c +++ b/drivers/input/touchscreen/zforce_ts.c @@ -146,16 +146,6 @@ static int zforce_command(struct zforce_ts *ts, u8 cmd) return 0; } -static void zforce_reset_assert(struct zforce_ts *ts) -{ - gpiod_set_value_cansleep(ts->gpio_rst, 1); -} - -static void zforce_reset_deassert(struct zforce_ts *ts) -{ - gpiod_set_value_cansleep(ts->gpio_rst, 0); -} - static int zforce_send_wait(struct zforce_ts *ts, const char *buf, int len) { struct i2c_client *client = ts->client; @@ -672,7 +662,7 @@ static void zforce_reset(void *data) { struct zforce_ts *ts = data; - zforce_reset_assert(ts); + gpiod_set_value_cansleep(ts->gpio_rst, 1); udelay(10); } @@ -807,7 +797,7 @@ static int zforce_probe(struct i2c_client *client) i2c_set_clientdata(client, ts); /* let the controller boot */ - zforce_reset_deassert(ts); + gpiod_set_value_cansleep(ts->gpio_rst, 0); ts->command_waiting = NOTIFICATION_BOOTCOMPLETE; if (wait_for_completion_timeout(&ts->command_done, WAIT_TIMEOUT) == 0)