summaryrefslogtreecommitdiff
path: root/drivers/mfd/stmpe-i2c.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-19 01:43:15 +0300
committerLee Jones <lee@kernel.org>2022-12-07 16:27:24 +0300
commit50b1d5bab4424169d8cc16853a5aa1140fe2bb78 (patch)
tree8c1cf79daaa97b3cafe73e318b54e611ed0c15b4 /drivers/mfd/stmpe-i2c.c
parent05b62f4ca66d8c20da59ddc3fdc72bd973acb1b6 (diff)
downloadlinux-50b1d5bab4424169d8cc16853a5aa1140fe2bb78.tar.xz
mfd: stmpe-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-462-uwe@kleine-koenig.org
Diffstat (limited to 'drivers/mfd/stmpe-i2c.c')
-rw-r--r--drivers/mfd/stmpe-i2c.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 4d55494a97c4..624e3d421b9f 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -67,8 +67,9 @@ static const struct of_device_id stmpe_of_match[] = {
MODULE_DEVICE_TABLE(of, stmpe_of_match);
static int
-stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
+stmpe_i2c_probe(struct i2c_client *i2c)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
enum stmpe_partnum partnum;
const struct of_device_id *of_id;
@@ -119,7 +120,7 @@ static struct i2c_driver stmpe_i2c_driver = {
#endif
.of_match_table = stmpe_of_match,
},
- .probe = stmpe_i2c_probe,
+ .probe_new = stmpe_i2c_probe,
.remove = stmpe_i2c_remove,
.id_table = stmpe_i2c_id,
};