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/st33zp24/i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Comments
On Fri, Nov 18, 2022 at 11:35:35PM +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/st33zp24/i2c.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c > index 614c7d8ed84f..0cd614933b4a 100644 > --- a/drivers/char/tpm/st33zp24/i2c.c > +++ b/drivers/char/tpm/st33zp24/i2c.c > @@ -101,8 +101,7 @@ static const struct st33zp24_phy_ops i2c_phy_ops = { > * @return: 0 in case of success. > * -1 in other case. > */ > -static int st33zp24_i2c_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int st33zp24_i2c_probe(struct i2c_client *client) > { > struct st33zp24_i2c_phy *phy; > > @@ -167,7 +166,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 = st33zp24_i2c_probe, > + .probe_new = st33zp24_i2c_probe, > .remove = st33zp24_i2c_remove, > .id_table = st33zp24_i2c_id > }; > -- > 2.38.1 > Acked-by: Jarkko Sakkinen <jarkko@kernel.org> BR, Jarkko
Hello,
while rebasing my series onto today's next I noticed the Subject being
broken:
$Subject ~= s/Convert to //
Apart from that I wonder who feels responsible to apply this patch (and
the other tpm patches in this series). They got an Ack by Jarkko, but
didn't appear in next.
The plan for this series is not to apply to a single tree, but let the
subsystem maintainers take their patches. I'd be happy if you consider
them for the next merge window.
Should I resend the tpm patches (with the subject fixed) once v6.2-rc1
is published?
Note that 662233731d66 ("i2c: core: Introduce i2c_client_get_device_id
helper function") is already in Linus' tree, so if your tree is new
enough (say v6.2-rc1 then) you don't need to care for this dependency.
Best regards and thanks
Uwe
I picked it now. BR, Jarkko On Fri, Dec 16, 2022 at 10:09:04AM +0100, Uwe Kleine-König wrote: > Hello, > > while rebasing my series onto today's next I noticed the Subject being > broken: > > $Subject ~= s/Convert to // > > Apart from that I wonder who feels responsible to apply this patch (and > the other tpm patches in this series). They got an Ack by Jarkko, but > didn't appear in next. > > The plan for this series is not to apply to a single tree, but let the > subsystem maintainers take their patches. I'd be happy if you consider > them for the next merge window. > > Should I resend the tpm patches (with the subject fixed) once v6.2-rc1 > is published? > > Note that 662233731d66 ("i2c: core: Introduce i2c_client_get_device_id > helper function") is already in Linus' tree, so if your tree is new > enough (say v6.2-rc1 then) you don't need to care for this dependency. > > Best regards and thanks > Uwe > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | https://www.pengutronix.de/ |
Hello Jarkko, On Fri, Dec 30, 2022 at 11:54:25PM +0000, Jarkko Sakkinen wrote: > I picked it now. > > BR, Jarkko > > On Fri, Dec 16, 2022 at 10:09:04AM +0100, Uwe Kleine-König wrote: > > while rebasing my series onto today's next I noticed the Subject being > > broken: > > > > $Subject ~= s/Convert to // I see you picked this patch, but you didn't drop the duplicated "Convert to " :-\ Also you didn't pick patches #2 - #5 which are tpm related, too. Best regards Uwe
On Fri, Jan 06, 2023 at 06:56:17PM +0100, Uwe Kleine-König wrote: > Hello Jarkko, > > On Fri, Dec 30, 2022 at 11:54:25PM +0000, Jarkko Sakkinen wrote: > > I picked it now. > > > > BR, Jarkko > > > > On Fri, Dec 16, 2022 at 10:09:04AM +0100, Uwe Kleine-König wrote: > > > while rebasing my series onto today's next I noticed the Subject being > > > broken: > > > > > > $Subject ~= s/Convert to // > > I see you picked this patch, but you didn't drop the duplicated "Convert > to " :-\ > > Also you didn't pick patches #2 - #5 which are tpm related, too. Should be good now. BR, Jarkko
diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c index 614c7d8ed84f..0cd614933b4a 100644 --- a/drivers/char/tpm/st33zp24/i2c.c +++ b/drivers/char/tpm/st33zp24/i2c.c @@ -101,8 +101,7 @@ static const struct st33zp24_phy_ops i2c_phy_ops = { * @return: 0 in case of success. * -1 in other case. */ -static int st33zp24_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int st33zp24_i2c_probe(struct i2c_client *client) { struct st33zp24_i2c_phy *phy; @@ -167,7 +166,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 = st33zp24_i2c_probe, + .probe_new = st33zp24_i2c_probe, .remove = st33zp24_i2c_remove, .id_table = st33zp24_i2c_id };