[PATCH 257/606] Input: silead - Convert to i2c's .probe_new()

From: Uwe Kleine-König
Date: Fri Nov 18 2022 - 18:51:54 EST


From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>

.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@xxxxxxxxxxxxxx>
---
drivers/input/touchscreen/silead.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index 3eef8c01090f..8a7351c4414c 100644
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -652,9 +652,9 @@ static void silead_disable_regulator(void *arg)
regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);
}

-static int silead_ts_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int silead_ts_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct silead_ts_data *data;
struct device *dev = &client->dev;
int error;
@@ -826,7 +826,7 @@ MODULE_DEVICE_TABLE(of, silead_ts_of_match);
#endif

static struct i2c_driver silead_ts_driver = {
- .probe = silead_ts_probe,
+ .probe_new = silead_ts_probe,
.id_table = silead_ts_id,
.driver = {
.name = SILEAD_TS_NAME,
--
2.38.1