Commit Message
Uwe Kleine-König
Nov. 18, 2022, 10:44 p.m. UTC
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> .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> --- drivers/regulator/fan53555.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Fri, Nov 18, 2022 at 11:44:35PM +0100, Uwe Kleine-König wrote:
> + const struct i2c_device_id *id = i2c_client_get_device_id(client);
This function is only in -next so I'll skip all the patches that need
it.
On Tue, Nov 22, 2022 at 07:41:12PM +0000, Mark Brown wrote: > On Fri, Nov 18, 2022 at 11:44:35PM +0100, Uwe Kleine-König wrote: > > > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > > This function is only in -next so I'll skip all the patches that need > it. Just in case you missed that information from the cover letter: You can pull this function into your tree from Wolfram's immutable branch at https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/client_device_id_helper-immutable Best regards Uwe
On Tue, Nov 22, 2022 at 09:01:40PM +0100, Uwe Kleine-König wrote: > On Tue, Nov 22, 2022 at 07:41:12PM +0000, Mark Brown wrote: > > On Fri, Nov 18, 2022 at 11:44:35PM +0100, Uwe Kleine-König wrote: > > > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > > This function is only in -next so I'll skip all the patches that need > > it. > Just in case you missed that information from the cover letter: > You can pull this function into your tree from Wolfram's immutable > branch at > https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/client_device_id_helper-immutable No, the bit I found about it in the commit message (which I had to go looking for...) was a link to some discussion about how it'd be a good idea to apply it. I suspect things might go more smoothly if things were resent as per-subsystem serieses TBH.
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c index dac1fb584fa3..529963a7e4f5 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -549,9 +549,9 @@ static const struct of_device_id __maybe_unused fan53555_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, fan53555_dt_ids); -static int fan53555_regulator_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int fan53555_regulator_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device_node *np = client->dev.of_node; struct fan53555_device_info *di; struct fan53555_platform_data *pdata; @@ -665,7 +665,7 @@ static struct i2c_driver fan53555_regulator_driver = { .name = "fan53555-regulator", .of_match_table = of_match_ptr(fan53555_dt_ids), }, - .probe = fan53555_regulator_probe, + .probe_new = fan53555_regulator_probe, .id_table = fan53555_id, };