diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-11-19 01:45:36 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2022-11-24 22:20:27 +0300 |
commit | 2ff85020ec5db4af3b55d35f5b8385e830c39fdd (patch) | |
tree | 7c8735b242a41d4db00cb202e345b5d732b69622 /sound/soc/codecs/max98396.c | |
parent | 88ade2abba1e46fe581610911240054538f8db88 (diff) | |
download | linux-2ff85020ec5db4af3b55d35f5b8385e830c39fdd.tar.xz |
ASoC: max98396: 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>
Link: https://lore.kernel.org/r/20221118224540.619276-603-uwe@kleine-koenig.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/max98396.c')
-rw-r--r-- | sound/soc/codecs/max98396.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/max98396.c b/sound/soc/codecs/max98396.c index a7b6a23f2cd8..db3de41f10e0 100644 --- a/sound/soc/codecs/max98396.c +++ b/sound/soc/codecs/max98396.c @@ -1731,9 +1731,9 @@ static void max98396_supply_disable(void *r) regulator_disable((struct regulator *) r); } -static int max98396_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int max98396_i2c_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct max98396_priv *max98396 = NULL; int i, ret, reg; @@ -1907,7 +1907,7 @@ static struct i2c_driver max98396_i2c_driver = { .acpi_match_table = ACPI_PTR(max98396_acpi_match), .pm = &max98396_pm, }, - .probe = max98396_i2c_probe, + .probe_new = max98396_i2c_probe, .id_table = max98396_i2c_id, }; |