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 342/606] media: i2c/ir-kbd-i2c: 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/media/i2c/ir-kbd-i2c.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
    index 25bf1132dbff..51921068931d 100644
    --- a/drivers/media/i2c/ir-kbd-i2c.c
    +++ b/drivers/media/i2c/ir-kbd-i2c.c
    @@ -757,8 +757,9 @@ static int zilog_tx_duty_cycle(struct rc_dev *dev, u32 duty_cycle)
    return 0;
    }

    -static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
    +static int ir_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    char *ir_codes = NULL;
    const char *name = NULL;
    u64 rc_proto = RC_PROTO_BIT_UNKNOWN;
    @@ -987,7 +988,7 @@ static struct i2c_driver ir_kbd_driver = {
    .driver = {
    .name = "ir-kbd-i2c",
    },
    - .probe = ir_probe,
    + .probe_new = ir_probe,
    .remove = ir_remove,
    .id_table = ir_kbd_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:13    [W:2.681 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site