summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-11-18 23:42:32 +0100
committerLee Jones <lee@kernel.org>2022-12-07 13:27:20 +0000
commit6cb7ac1c0402e61d84652b0fb79a471aca0fb7b2 (patch)
tree0a1443bdda1712617e1c4def228a399912365ab7
parent48c2c36686125ff4a7ac6c6448dff31880ddd0df (diff)
downloadlinux-6cb7ac1c0402e61d84652b0fb79a471aca0fb7b2.tar.bz2
mfd: arizona-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-419-uwe@kleine-koenig.org
-rw-r--r--drivers/mfd/arizona-i2c.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index bfc7cf56ff2c..20dd1b1e4ec1 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -20,9 +20,9 @@
#include "arizona.h"
-static int arizona_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int arizona_i2c_probe(struct i2c_client *i2c)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
const void *match_data;
struct arizona *arizona;
const struct regmap_config *regmap_config = NULL;
@@ -120,7 +120,7 @@ static struct i2c_driver arizona_i2c_driver = {
.pm = &arizona_pm_ops,
.of_match_table = of_match_ptr(arizona_i2c_of_match),
},
- .probe = arizona_i2c_probe,
+ .probe_new = arizona_i2c_probe,
.remove = arizona_i2c_remove,
.id_table = arizona_i2c_id,
};