On Thu, May 25, 2023 at 10:40:21PM +0200, 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.
Ok, this is in my for-next tree. Or, if you prefer: Acked-by: Corey Minyard <cminy...@mvista.com> if you would prefer to apply this, and I can drop mine. -corey > > Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de> > --- > drivers/char/ipmi/ipmb_dev_int.c | 2 +- > drivers/char/ipmi/ipmi_ipmb.c | 2 +- > drivers/char/ipmi/ipmi_ssif.c | 2 +- > drivers/char/ipmi/ssif_bmc.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/ipmi/ipmb_dev_int.c > b/drivers/char/ipmi/ipmb_dev_int.c > index a0e9e80d92ee..49100845fcb7 100644 > --- a/drivers/char/ipmi/ipmb_dev_int.c > +++ b/drivers/char/ipmi/ipmb_dev_int.c > @@ -366,7 +366,7 @@ static struct i2c_driver ipmb_driver = { > .name = "ipmb-dev", > .acpi_match_table = ACPI_PTR(acpi_ipmb_id), > }, > - .probe_new = ipmb_probe, > + .probe = ipmb_probe, > .remove = ipmb_remove, > .id_table = ipmb_id, > }; > diff --git a/drivers/char/ipmi/ipmi_ipmb.c b/drivers/char/ipmi/ipmi_ipmb.c > index 3f1c9f1573e7..4e335832fc26 100644 > --- a/drivers/char/ipmi/ipmi_ipmb.c > +++ b/drivers/char/ipmi/ipmi_ipmb.c > @@ -572,7 +572,7 @@ static struct i2c_driver ipmi_ipmb_driver = { > .name = DEVICE_NAME, > .of_match_table = of_ipmi_ipmb_match, > }, > - .probe_new = ipmi_ipmb_probe, > + .probe = ipmi_ipmb_probe, > .remove = ipmi_ipmb_remove, > .id_table = ipmi_ipmb_id, > }; > diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c > index 3b921c78ba08..c6c9bcf6bf55 100644 > --- a/drivers/char/ipmi/ipmi_ssif.c > +++ b/drivers/char/ipmi/ipmi_ssif.c > @@ -2054,7 +2054,7 @@ static struct i2c_driver ssif_i2c_driver = { > .driver = { > .name = DEVICE_NAME > }, > - .probe_new = ssif_probe, > + .probe = ssif_probe, > .remove = ssif_remove, > .alert = ssif_alert, > .id_table = ssif_id, > diff --git a/drivers/char/ipmi/ssif_bmc.c b/drivers/char/ipmi/ssif_bmc.c > index caee848261e9..56346fb32872 100644 > --- a/drivers/char/ipmi/ssif_bmc.c > +++ b/drivers/char/ipmi/ssif_bmc.c > @@ -860,7 +860,7 @@ static struct i2c_driver ssif_bmc_driver = { > .name = DEVICE_NAME, > .of_match_table = ssif_bmc_match, > }, > - .probe_new = ssif_bmc_probe, > + .probe = ssif_bmc_probe, > .remove = ssif_bmc_remove, > .id_table = ssif_bmc_id, > }; > > base-commit: ac9a78681b921877518763ba0e89202254349d1b > -- > 2.39.2 > _______________________________________________ Openipmi-developer mailing list Openipmi-developer@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openipmi-developer