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 045/606] i2c: slave-eeprom: 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/i2c/i2c-slave-eeprom.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/i2c/i2c-slave-eeprom.c b/drivers/i2c/i2c-slave-eeprom.c
    index 4abc2d919881..5f25f23c4ff8 100644
    --- a/drivers/i2c/i2c-slave-eeprom.c
    +++ b/drivers/i2c/i2c-slave-eeprom.c
    @@ -140,8 +140,9 @@ static int i2c_slave_init_eeprom_data(struct eeprom_data *eeprom, struct i2c_cli
    return 0;
    }

    -static int i2c_slave_eeprom_probe(struct i2c_client *client, const struct i2c_device_id *id)
    +static int i2c_slave_eeprom_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct eeprom_data *eeprom;
    int ret;
    unsigned int size = FIELD_GET(I2C_SLAVE_BYTELEN, id->driver_data) + 1;
    @@ -206,7 +207,7 @@ static struct i2c_driver i2c_slave_eeprom_driver = {
    .driver = {
    .name = "i2c-slave-eeprom",
    },
    - .probe = i2c_slave_eeprom_probe,
    + .probe_new = i2c_slave_eeprom_probe,
    .remove = i2c_slave_eeprom_remove,
    .id_table = i2c_slave_eeprom_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-18 23:48    [W:4.159 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site