summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/madera-i2c.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:42:51 +0100
committerLee Jones <lee@kernel.org>2022-12-07 13:27:22 +0000
commit806b9167d4175787651b497892213fe7974e9ee0 (patch)
treec061f165b0f673a023590a7881fb94fd76e9b337 /drivers/mfd/madera-i2c.c
parent2034ef7458083eb92ce3f563cca883772118d8e2 (diff)
downloadlinux-806b9167d4175787651b497892213fe7974e9ee0.tar.bz2
mfd: madera-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> Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20221118224540.619276-438-uwe@kleine-koenig.org
Diffstat (limited to 'drivers/mfd/madera-i2c.c')
-rw-r--r--drivers/mfd/madera-i2c.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c
index 915d2f95bad3..47e65d88feb0 100644
--- a/drivers/mfd/madera-i2c.c
+++ b/drivers/mfd/madera-i2c.c
@@ -17,9 +17,9 @@
#include "madera.h"
-static int madera_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int madera_i2c_probe(struct i2c_client *i2c)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
struct madera *madera;
const struct regmap_config *regmap_16bit_config = NULL;
const struct regmap_config *regmap_32bit_config = NULL;
@@ -139,7 +139,7 @@ static struct i2c_driver madera_i2c_driver = {
.pm = &madera_pm_ops,
.of_match_table = of_match_ptr(madera_of_match),
},
- .probe = madera_i2c_probe,
+ .probe_new = madera_i2c_probe,
.remove = madera_i2c_remove,
.id_table = madera_i2c_id,
};