Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfd: rsmu_i2c: Convert to i2c's .probe_new() again

Browse Source 
This commit reapplies commit 601e6d48ee ("mfd: rsmu_i2c: Convert to
i2c's .probe_new()") which was accidently reverted by commit
1b3b1d6c27cc ("mfd: rsmu: Support 32-bit address space").

Without this change the driver fails to build in combination with commit
03c835f498 ("i2c: Switch .probe() to not take an id parameter") which
is contained in v6.3-rc2.

Fixes: 1b3b1d6c27cc ("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
This commit is contained in:
Uwe Kleine-König 2023-03-31 09:03:44 +02:00 committed by Lee Jones
parent 72d4a16837
commit a29f5a3eeb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/rsmu_i2c.c
View File

@ -201,9 +201,9 @@ static const struct regmap_config rsmu_sl_regmap_config = {
.can_multi_write = true, .can_multi_write = true,
}; };
static int rsmu_i2c_probe(struct i2c_client *client, static int rsmu_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(client);
const struct regmap_config *cfg; const struct regmap_config *cfg;
struct rsmu_ddata *rsmu; struct rsmu_ddata *rsmu;
int ret; int ret;
@ -279,7 +279,7 @@ static struct i2c_driver rsmu_i2c_driver = {
.name = "rsmu-i2c", .name = "rsmu-i2c",
.of_match_table = of_match_ptr(rsmu_i2c_of_match), .of_match_table = of_match_ptr(rsmu_i2c_of_match),
}, },
.probe = rsmu_i2c_probe, .probe_new = rsmu_i2c_probe,
.remove = rsmu_i2c_remove, .remove = rsmu_i2c_remove,
.id_table = rsmu_i2c_id, .id_table = rsmu_i2c_id,
}; };