[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221118224540.619276-238-uwe@kleine-koenig.org>
Date: Fri, 18 Nov 2022 23:39:31 +0100
From: Uwe Kleine-König <uwe@...ine-koenig.org>
To: Angel Iglesias <ang.iglesiasg@...il.com>,
Lee Jones <lee.jones@...aro.org>,
Grant Likely <grant.likely@...aro.org>,
Wolfram Sang <wsa@...nel.org>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Michael Trimarchi <michael@...rulasolutions.com>,
Dario Binacchi <dario.binacchi@...rulasolutions.com>,
Oliver Graute <oliver.graute@...oconnector.com>,
Wolfram Sang <wsa+renesas@...g-engineering.com>
Cc: linux-i2c@...r.kernel.org, kernel@...gutronix.de,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH 237/606] Input: edt-ft5x06 - Convert to i2c's .probe_new()
From: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
---
drivers/input/touchscreen/edt-ft5x06.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 9ac1378610bc..ddd0f1f62458 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -1131,9 +1131,9 @@ static void edt_ft5x06_disable_regulators(void *arg)
regulator_disable(data->iovcc);
}
-static int edt_ft5x06_ts_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int edt_ft5x06_ts_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
const struct edt_i2c_chip_data *chip_data;
struct edt_ft5x06_ts_data *tsdata;
u8 buf[2] = { 0xfc, 0x00 };
@@ -1504,7 +1504,7 @@ static struct i2c_driver edt_ft5x06_ts_driver = {
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
},
.id_table = edt_ft5x06_ts_id,
- .probe = edt_ft5x06_ts_probe,
+ .probe_new = edt_ft5x06_ts_probe,
.remove = edt_ft5x06_ts_remove,
};
--
2.38.1
Powered by blists - more mailing lists