On Fri, Nov 18, 2022 at 11:35:38PM +0100, Uwe Kleine-König wrote:
> From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
>
> .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@xxxxxxxxxxxxxx>
> ---
> drivers/char/tpm/tpm_i2c_nuvoton.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
> index 95c37350cc8e..a026e98add50 100644
> --- a/drivers/char/tpm/tpm_i2c_nuvoton.c
> +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
> @@ -522,9 +522,9 @@ static int get_vid(struct i2c_client *client, u32 *res)
> return 0;
> }
>
> -static int i2c_nuvoton_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int i2c_nuvoton_probe(struct i2c_client *client)
> {
> + const struct i2c_device_id *id = i2c_client_get_device_id(client);
> int rc;
> struct tpm_chip *chip;
> struct device *dev = &client->dev;
> @@ -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 = i2c_nuvoton_probe,
> + .probe_new = i2c_nuvoton_probe,
> .remove = i2c_nuvoton_remove,
> .driver = {
> .name = "tpm_i2c_nuvoton",
> --
> 2.38.1
>
Acked-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
BR, Jarkko
