Commit a29f5a3e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Lee Jones
Browse files

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



This commit reapplies commit 601e6d48 ("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
03c835f4 ("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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230331070344.czphnnmvu2ojzo5l@pengutronix.de
parent 72d4a168

drivers/mfd/rsmu_i2c.c

+3 −3
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ static const struct regmap_config rsmu_sl_regmap_config = { 
	.can_multi_write = true,

};



static int rsmu_i2c_probe(struct i2c_client *client,

			  const struct i2c_device_id *id)

static int rsmu_i2c_probe(struct i2c_client *client)

{

	const struct i2c_device_id *id = i2c_client_get_device_id(client);

	const struct regmap_config *cfg;

	struct rsmu_ddata *rsmu;

	int ret;
@@ -279,7 +279,7 @@ static struct i2c_driver rsmu_i2c_driver = { 
		.name = "rsmu-i2c",

		.of_match_table = of_match_ptr(rsmu_i2c_of_match),

	},

	.probe = rsmu_i2c_probe,

	.probe_new = rsmu_i2c_probe,

	.remove	= rsmu_i2c_remove,

	.id_table = rsmu_i2c_id,

};