On Thu May 25, 2023 at 11:24 PM EEST, Uwe Kleine-König wrote:
> 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@xxxxxxxxxxxxxx>
> ---
> drivers/char/tpm/st33zp24/i2c.c | 2 +-
> drivers/char/tpm/tpm_i2c_atmel.c | 2 +-
> drivers/char/tpm/tpm_i2c_infineon.c | 2 +-
> drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +-
> drivers/char/tpm/tpm_tis_i2c.c | 2 +-
> drivers/char/tpm/tpm_tis_i2c_cr50.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
> index 2d28f55ef490..661574bb0acf 100644
> --- a/drivers/char/tpm/st33zp24/i2c.c
> +++ b/drivers/char/tpm/st33zp24/i2c.c
> @@ -160,7 +160,7 @@ static struct i2c_driver st33zp24_i2c_driver = {
> .of_match_table = of_match_ptr(of_st33zp24_i2c_match),
> .acpi_match_table = ACPI_PTR(st33zp24_i2c_acpi_match),
> },
> - .probe_new = st33zp24_i2c_probe,
> + .probe = st33zp24_i2c_probe,
> .remove = st33zp24_i2c_remove,
> .id_table = st33zp24_i2c_id
> };
> diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c
> index 8f77154e0550..301a95b3734f 100644
> --- a/drivers/char/tpm/tpm_i2c_atmel.c
> +++ b/drivers/char/tpm/tpm_i2c_atmel.c
> @@ -203,7 +203,7 @@ static SIMPLE_DEV_PM_OPS(i2c_atmel_pm_ops, tpm_pm_suspend, tpm_pm_resume);
>
> static struct i2c_driver i2c_atmel_driver = {
> .id_table = i2c_atmel_id,
> - .probe_new = i2c_atmel_probe,
> + .probe = i2c_atmel_probe,
> .remove = i2c_atmel_remove,
> .driver = {
> .name = I2C_DRIVER_NAME,
> diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
> index 7cdaff52a96d..81d8a78dc655 100644
> --- a/drivers/char/tpm/tpm_i2c_infineon.c
> +++ b/drivers/char/tpm/tpm_i2c_infineon.c
> @@ -716,7 +716,7 @@ static void tpm_tis_i2c_remove(struct i2c_client *client)
>
> static struct i2c_driver tpm_tis_i2c_driver = {
> .id_table = tpm_tis_i2c_table,
> - .probe_new = tpm_tis_i2c_probe,
> + .probe = tpm_tis_i2c_probe,
> .remove = tpm_tis_i2c_remove,
> .driver = {
> .name = "tpm_i2c_infineon",
> diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
> index a026e98add50..d7be03c41098 100644
> --- a/drivers/char/tpm/tpm_i2c_nuvoton.c
> +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
> @@ -650,7 +650,7 @@ static SIMPLE_DEV_PM_OPS(i2c_nuvoton_pm_ops, tpm_pm_suspend, tpm_pm_resume);
>
> static struct i2c_driver i2c_nuvoton_driver = {
> .id_table = i2c_nuvoton_id,
> - .probe_new = i2c_nuvoton_probe,
> + .probe = i2c_nuvoton_probe,
> .remove = i2c_nuvoton_remove,
> .driver = {
> .name = "tpm_i2c_nuvoton",
> diff --git a/drivers/char/tpm/tpm_tis_i2c.c b/drivers/char/tpm/tpm_tis_i2c.c
> index c8c34adc14c0..11b4196b7136 100644
> --- a/drivers/char/tpm/tpm_tis_i2c.c
> +++ b/drivers/char/tpm/tpm_tis_i2c.c
> @@ -379,7 +379,7 @@ static struct i2c_driver tpm_tis_i2c_driver = {
> .pm = &tpm_tis_pm,
> .of_match_table = of_match_ptr(of_tis_i2c_match),
> },
> - .probe_new = tpm_tis_i2c_probe,
> + .probe = tpm_tis_i2c_probe,
> .remove = tpm_tis_i2c_remove,
> .id_table = tpm_tis_i2c_id,
> };
> diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> index 376ae18a04eb..e70abd69e1ae 100644
> --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
> +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> @@ -779,7 +779,7 @@ static void tpm_cr50_i2c_remove(struct i2c_client *client)
> static SIMPLE_DEV_PM_OPS(cr50_i2c_pm, tpm_pm_suspend, tpm_pm_resume);
>
> static struct i2c_driver cr50_i2c_driver = {
> - .probe_new = tpm_cr50_i2c_probe,
> + .probe = tpm_cr50_i2c_probe,
> .remove = tpm_cr50_i2c_remove,
> .driver = {
> .name = "cr50_i2c",
> --
> 2.39.2
Thanks, applied!
BR, Jarkko
