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

tpm: Switch i2c drivers back to use .probe()

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
convert back to (the new) .probe() to be able to eventually drop
.probe_new() from struct i2c_driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>

authored by

Uwe Kleine-König and committed by
Jarkko Sakkinen
be6f48a7 2d7f105e

+6 -6
+1 -1
drivers/char/tpm/st33zp24/i2c.c
··· 160 160 .of_match_table = of_match_ptr(of_st33zp24_i2c_match), 161 161 .acpi_match_table = ACPI_PTR(st33zp24_i2c_acpi_match), 162 162 }, 163 - .probe_new = st33zp24_i2c_probe, 163 + .probe = st33zp24_i2c_probe, 164 164 .remove = st33zp24_i2c_remove, 165 165 .id_table = st33zp24_i2c_id 166 166 };
+1 -1
drivers/char/tpm/tpm_i2c_atmel.c
··· 203 203 204 204 static struct i2c_driver i2c_atmel_driver = { 205 205 .id_table = i2c_atmel_id, 206 - .probe_new = i2c_atmel_probe, 206 + .probe = i2c_atmel_probe, 207 207 .remove = i2c_atmel_remove, 208 208 .driver = { 209 209 .name = I2C_DRIVER_NAME,
+1 -1
drivers/char/tpm/tpm_i2c_infineon.c
··· 716 716 717 717 static struct i2c_driver tpm_tis_i2c_driver = { 718 718 .id_table = tpm_tis_i2c_table, 719 - .probe_new = tpm_tis_i2c_probe, 719 + .probe = tpm_tis_i2c_probe, 720 720 .remove = tpm_tis_i2c_remove, 721 721 .driver = { 722 722 .name = "tpm_i2c_infineon",
+1 -1
drivers/char/tpm/tpm_i2c_nuvoton.c
··· 650 650 651 651 static struct i2c_driver i2c_nuvoton_driver = { 652 652 .id_table = i2c_nuvoton_id, 653 - .probe_new = i2c_nuvoton_probe, 653 + .probe = i2c_nuvoton_probe, 654 654 .remove = i2c_nuvoton_remove, 655 655 .driver = { 656 656 .name = "tpm_i2c_nuvoton",
+1 -1
drivers/char/tpm/tpm_tis_i2c.c
··· 394 394 .pm = &tpm_tis_pm, 395 395 .of_match_table = of_match_ptr(of_tis_i2c_match), 396 396 }, 397 - .probe_new = tpm_tis_i2c_probe, 397 + .probe = tpm_tis_i2c_probe, 398 398 .remove = tpm_tis_i2c_remove, 399 399 .id_table = tpm_tis_i2c_id, 400 400 };
+1 -1
drivers/char/tpm/tpm_tis_i2c_cr50.c
··· 779 779 static SIMPLE_DEV_PM_OPS(cr50_i2c_pm, tpm_pm_suspend, tpm_pm_resume); 780 780 781 781 static struct i2c_driver cr50_i2c_driver = { 782 - .probe_new = tpm_cr50_i2c_probe, 782 + .probe = tpm_cr50_i2c_probe, 783 783 .remove = tpm_cr50_i2c_remove, 784 784 .driver = { 785 785 .name = "cr50_i2c",