diff mbox series

[237/606] Input: edt-ft5x06 - Convert to i2c's .probe_new()

Message ID 20221118224540.619276-238-uwe@kleine-koenig.org (mailing list archive)
State Mainlined
Commit e7c31218086fa126bfddbaeb2c64b469ab86cd1d
Headers show
Series i2c: Complete conversion to i2c_probe_new | expand

Commit Message

Uwe Kleine-König Nov. 18, 2022, 10:39 p.m. UTC 
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.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@pengutronix.de>
---
 drivers/input/touchscreen/edt-ft5x06.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Oliver Graute Nov. 21, 2022, 7:42 a.m. UTC | #1 
> Am 18.11.2022 um 23:39 schrieb Uwe Kleine-König <uwe@kleine-koenig.org>:
> 
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.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@pengutronix.de>

Acked-by: Oliver Graute <oliver.graute@kococonnector.com>

> ---
> 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
>
diff mbox series

Patch

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,
 };