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 571/606] serial: sc16is7xx: 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/tty/serial/sc16is7xx.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
    index 39f92eb1e698..8412b25eac86 100644
    --- a/drivers/tty/serial/sc16is7xx.c
    +++ b/drivers/tty/serial/sc16is7xx.c
    @@ -1665,9 +1665,9 @@ MODULE_ALIAS("spi:sc16is7xx");
    #endif

    #ifdef CONFIG_SERIAL_SC16IS7XX_I2C
    -static int sc16is7xx_i2c_probe(struct i2c_client *i2c,
    - const struct i2c_device_id *id)
    +static int sc16is7xx_i2c_probe(struct i2c_client *i2c)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
    const struct sc16is7xx_devtype *devtype;
    struct regmap *regmap;

    @@ -1708,7 +1708,7 @@ static struct i2c_driver sc16is7xx_i2c_uart_driver = {
    .name = SC16IS7XX_NAME,
    .of_match_table = sc16is7xx_dt_ids,
    },
    - .probe = sc16is7xx_i2c_probe,
    + .probe_new = sc16is7xx_i2c_probe,
    .remove = sc16is7xx_i2c_remove,
    .id_table = sc16is7xx_i2c_id_table,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:43    [W:4.075 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site