Skip to content

Commit a29f5a3

Browse files
Uwe Kleine-Königlag-linaro
authored andcommitted
mfd: rsmu_i2c: Convert to i2c's .probe_new() again
This commit reapplies commit 601e6d4 ("mfd: rsmu_i2c: Convert to i2c's .probe_new()") which was accidently reverted by commit 1b3b1d6 ("mfd: rsmu: Support 32-bit address space"). Without this change the driver fails to build in combination with commit 03c835f ("i2c: Switch .probe() to not take an id parameter") which is contained in v6.3-rc2. Fixes: 1b3b1d6 ("mfd: rsmu: Support 32-bit address space") 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/20230331070344.czphnnmvu2ojzo5l@pengutronix.de
1 parent 72d4a16 commit a29f5a3

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/mfd/rsmu_i2c.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ static const struct regmap_config rsmu_sl_regmap_config = {
201201
.can_multi_write = true,
202202
};
203203

204-
static int rsmu_i2c_probe(struct i2c_client *client,
205-
const struct i2c_device_id *id)
204+
static int rsmu_i2c_probe(struct i2c_client *client)
206205
{
206+
const struct i2c_device_id *id = i2c_client_get_device_id(client);
207207
const struct regmap_config *cfg;
208208
struct rsmu_ddata *rsmu;
209209
int ret;
@@ -279,7 +279,7 @@ static struct i2c_driver rsmu_i2c_driver = {
279279
.name = "rsmu-i2c",
280280
.of_match_table = of_match_ptr(rsmu_i2c_of_match),
281281
},
282-
.probe = rsmu_i2c_probe,
282+
.probe_new = rsmu_i2c_probe,
283283
.remove = rsmu_i2c_remove,
284284
.id_table = rsmu_i2c_id,
285285
};

0 commit comments

Comments
 (0)