Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Uwe Kleine-König and committed by
Mark Brown
2ff85020 88ade2ab

+3 -3
+3 -3
sound/soc/codecs/max98396.c
··· 1731 1731 regulator_disable((struct regulator *) r); 1732 1732 } 1733 1733 1734 - static int max98396_i2c_probe(struct i2c_client *i2c, 1735 - const struct i2c_device_id *id) 1734 + static int max98396_i2c_probe(struct i2c_client *i2c) 1736 1735 { 1736 + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); 1737 1737 struct max98396_priv *max98396 = NULL; 1738 1738 int i, ret, reg; 1739 1739 ··· 1907 1907 .acpi_match_table = ACPI_PTR(max98396_acpi_match), 1908 1908 .pm = &max98396_pm, 1909 1909 }, 1910 - .probe = max98396_i2c_probe, 1910 + .probe_new = max98396_i2c_probe, 1911 1911 .id_table = max98396_i2c_id, 1912 1912 }; 1913 1913