On Tue, 05 Sep 2023, Uwe Kleine-König wrote: > Now that all drivers are converted to the (new) .probe() callback, the > temporary .probe_new() can go away. \o/ > > Link: https://lore.kernel.org/linux-i2c/20230626094548.559542-1-u.kleine-koenig@xxxxxxxxxxxxxx > Reviewed-by: Javier Martinez Canillas <javierm@xxxxxxxxxx> > Reviewed-by: Jean Delvare <jdelvare@xxxxxxx> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > --- > include/linux/i2c.h | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/include/linux/i2c.h b/include/linux/i2c.h > index 3430cc2b05a6..0dae9db27538 100644 > --- a/include/linux/i2c.h > +++ b/include/linux/i2c.h > @@ -237,7 +237,6 @@ enum i2c_driver_flags { > * struct i2c_driver - represent an I2C device driver > * @class: What kind of i2c device we instantiate (for detect) > * @probe: Callback for device binding > - * @probe_new: Transitional callback for device binding - do not use > * @remove: Callback for device unbinding > * @shutdown: Callback for device shutdown > * @alert: Alert callback, for example for the SMBus alert protocol > @@ -272,16 +271,8 @@ enum i2c_driver_flags { > struct i2c_driver { > unsigned int class; > > - union { > /* Standard driver model interfaces */ > - int (*probe)(struct i2c_client *client); > - /* > - * Legacy callback that was part of a conversion of .probe(). > - * Today it has the same semantic as .probe(). Don't use for new > - * code. > - */ > - int (*probe_new)(struct i2c_client *client); > - }; > + int (*probe)(struct i2c_client *client); > void (*remove)(struct i2c_client *client); *party smiley* Good going Uwe! -- Lee Jones [李琼斯]