lkml.org 
[lkml]   [2022]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 500/606] net/mlx5: Convert to i2c's .probe_new()
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    .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>
    ---
    drivers/net/ethernet/mellanox/mlxsw/i2c.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlxsw/i2c.c b/drivers/net/ethernet/mellanox/mlxsw/i2c.c
    index f5f5f8dc3d19..2c586c2308ae 100644
    --- a/drivers/net/ethernet/mellanox/mlxsw/i2c.c
    +++ b/drivers/net/ethernet/mellanox/mlxsw/i2c.c
    @@ -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);
    }
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:43    [W:2.421 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site