Commit Message
Uwe Kleine-König
Nov. 18, 2022, 10:35 p.m. UTC
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> The probe function doesn't make use of the i2c_device_id * parameter so it can be trivially converted. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/char/tpm/tpm_tis_i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Comments
On Fri, Nov 18, 2022 at 11:35:39PM +0100, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/char/tpm/tpm_tis_i2c.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/tpm/tpm_tis_i2c.c b/drivers/char/tpm/tpm_tis_i2c.c > index 0692510dfcab..18fa8b4672a8 100644 > --- a/drivers/char/tpm/tpm_tis_i2c.c > +++ b/drivers/char/tpm/tpm_tis_i2c.c > @@ -312,8 +312,7 @@ static const struct tpm_tis_phy_ops tpm_i2c_phy_ops = { > .verify_crc = tpm_tis_i2c_verify_crc, > }; > > -static int tpm_tis_i2c_probe(struct i2c_client *dev, > - const struct i2c_device_id *id) > +static int tpm_tis_i2c_probe(struct i2c_client *dev) > { > struct tpm_tis_i2c_phy *phy; > const u8 crc_enable = 1; > @@ -379,7 +378,7 @@ static struct i2c_driver tpm_tis_i2c_driver = { > .pm = &tpm_tis_pm, > .of_match_table = of_match_ptr(of_tis_i2c_match), > }, > - .probe = tpm_tis_i2c_probe, > + .probe_new = tpm_tis_i2c_probe, > .remove = tpm_tis_i2c_remove, > .id_table = tpm_tis_i2c_id, > }; > -- > 2.38.1 > Acked-by: Jarkko Sakkinen <jarkko@kernel.org> BR, Jarkko
diff --git a/drivers/char/tpm/tpm_tis_i2c.c b/drivers/char/tpm/tpm_tis_i2c.c index 0692510dfcab..18fa8b4672a8 100644 --- a/drivers/char/tpm/tpm_tis_i2c.c +++ b/drivers/char/tpm/tpm_tis_i2c.c @@ -312,8 +312,7 @@ static const struct tpm_tis_phy_ops tpm_i2c_phy_ops = { .verify_crc = tpm_tis_i2c_verify_crc, }; -static int tpm_tis_i2c_probe(struct i2c_client *dev, - const struct i2c_device_id *id) +static int tpm_tis_i2c_probe(struct i2c_client *dev) { struct tpm_tis_i2c_phy *phy; const u8 crc_enable = 1; @@ -379,7 +378,7 @@ static struct i2c_driver tpm_tis_i2c_driver = { .pm = &tpm_tis_pm, .of_match_table = of_match_ptr(of_tis_i2c_match), }, - .probe = tpm_tis_i2c_probe, + .probe_new = tpm_tis_i2c_probe, .remove = tpm_tis_i2c_remove, .id_table = tpm_tis_i2c_id, };