summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:43:12 +0100
committerLee Jones <lee@kernel.org>2022-12-07 13:27:24 +0000
commitca08a4f30be612a2fa725f84c2f9b2dd8f54efee (patch)
tree5b2d14dff713ffdd2c8b6790b802b2648adebce2
parenta403e589705fa4b93732581450c5c05833105ae3 (diff)
downloadlinux-stable-ca08a4f30be612a2fa725f84c2f9b2dd8f54efee.tar.gz
linux-stable-ca08a4f30be612a2fa725f84c2f9b2dd8f54efee.tar.bz2
linux-stable-ca08a4f30be612a2fa725f84c2f9b2dd8f54efee.zip
mfd: si476x-i2c: Convert to i2c's .probe_new()
.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> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20221118224540.619276-459-uwe@kleine-koenig.org
-rw-r--r--drivers/mfd/si476x-i2c.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c
index 8166949b725c..22131cf85e3f 100644
--- a/drivers/mfd/si476x-i2c.c
+++ b/drivers/mfd/si476x-i2c.c
@@ -683,9 +683,9 @@ bool si476x_core_is_powered_up(struct si476x_core *core)
}
EXPORT_SYMBOL_GPL(si476x_core_is_powered_up);
-static int si476x_core_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int si476x_core_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
int rval;
struct si476x_core *core;
struct si476x_platform_data *pdata;
@@ -866,7 +866,7 @@ static struct i2c_driver si476x_core_driver = {
.driver = {
.name = "si476x-core",
},
- .probe = si476x_core_probe,
+ .probe_new = si476x_core_probe,
.remove = si476x_core_remove,
.id_table = si476x_id,
};