net/mlxsw: Convert to i2c's .probe_new()
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 23 Nov 2022 04:54:59 +0000 (20:54 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 23 Nov 2022 20:50:06 +0000 (12:50 -0800)
.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlxsw/i2c.c

index f5f5f8d..2c586c2 100644 (file)
@@ -632,9 +632,9 @@ static const struct mlxsw_bus mlxsw_i2c_bus = {
        .cmd_exec               = mlxsw_i2c_cmd_exec,
 };
 
-static int mlxsw_i2c_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int mlxsw_i2c_probe(struct i2c_client *client)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(client);
        const struct i2c_adapter_quirks *quirks = client->adapter->quirks;
        struct mlxsw_i2c *mlxsw_i2c;
        u8 status;
@@ -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 = mlxsw_i2c_probe;
+       i2c_driver->probe_new = mlxsw_i2c_probe;
        i2c_driver->remove = mlxsw_i2c_remove;
        return i2c_add_driver(i2c_driver);
 }