diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-11-18 23:35:38 +0100 |
---|---|---|
committer | Jarkko Sakkinen <jarkko@kernel.org> | 2023-02-13 10:11:20 +0200 |
commit | 8f3fb73b8b8dbac9803952086710fc32de377b8e (patch) | |
tree | 396f1417b7519815e511b8d2255750fea8ebc565 /drivers | |
parent | d5ae2f4760c5b332a805f1caae9eb10101152ddd (diff) | |
download | linux-8f3fb73b8b8dbac9803952086710fc32de377b8e.tar.gz linux-8f3fb73b8b8dbac9803952086710fc32de377b8e.tar.bz2 linux-8f3fb73b8b8dbac9803952086710fc32de377b8e.zip |
tpm: tpm_i2c_nuvoton: 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>
Acked-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/tpm/tpm_i2c_nuvoton.c | 6 |
1 files 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", |