| Message ID | 20230612072222.839292-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3a2cb45ca0ccb5dab9b701f50cfd981f8dfd1673 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: mlxsw: i2c: Switch back to use struct i2c_driver's .probe() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/apply | success | Patch already applied to net-next |
On Mon, Jun 12, 2023 at 09:22:22AM +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 > commit 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Tested-by: Ido Schimmel <idosch@nvidia.com> I assume it's intended for net-next. > --- > drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mellanox/mlxsw/i2c.c b/drivers/net/ethernet/mellanox/mlxsw/i2c.c > index 2c586c2308ae..41298835a11e 100644 > --- a/drivers/net/ethernet/mellanox/mlxsw/i2c.c > +++ b/drivers/net/ethernet/mellanox/mlxsw/i2c.c > @@ -751,7 +751,7 @@ static void mlxsw_i2c_remove(struct i2c_client *client) > > int mlxsw_i2c_driver_register(struct i2c_driver *i2c_driver) > { > - i2c_driver->probe_new = mlxsw_i2c_probe; > + i2c_driver->probe = mlxsw_i2c_probe; > i2c_driver->remove = mlxsw_i2c_remove; > return i2c_add_driver(i2c_driver); > } > > base-commit: ac9a78681b921877518763ba0e89202254349d1b > -- > 2.39.2 >
On Mon, Jun 12, 2023 at 11:20:31AM +0300, Ido Schimmel wrote: > On Mon, Jun 12, 2023 at 09:22:22AM +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 > > commit 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. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > Reviewed-by: Ido Schimmel <idosch@nvidia.com> > Tested-by: Ido Schimmel <idosch@nvidia.com> > > I assume it's intended for net-next. Indeed, forget the subject-prefix, sorry. Best regards Uwe
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 12 Jun 2023 09:22:22 +0200 you wrote: > After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > call-back type"), all drivers being converted to .probe_new() and then > commit 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > [...] Here is the summary with links: - net: mlxsw: i2c: Switch back to use struct i2c_driver's .probe() https://git.kernel.org/netdev/net-next/c/3a2cb45ca0cc You are awesome, thank you!
diff --git a/drivers/net/ethernet/mellanox/mlxsw/i2c.c b/drivers/net/ethernet/mellanox/mlxsw/i2c.c index 2c586c2308ae..41298835a11e 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/i2c.c +++ b/drivers/net/ethernet/mellanox/mlxsw/i2c.c @@ -751,7 +751,7 @@ static void mlxsw_i2c_remove(struct i2c_client *client) int mlxsw_i2c_driver_register(struct i2c_driver *i2c_driver) { - i2c_driver->probe_new = mlxsw_i2c_probe; + i2c_driver->probe = mlxsw_i2c_probe; i2c_driver->remove = mlxsw_i2c_remove; return i2c_add_driver(i2c_driver); }
After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then commit 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. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/net/ethernet/mellanox/mlxsw/i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: ac9a78681b921877518763ba0e89202254349d1b