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 193/606] Input: adp5589-keys - 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/input/keyboard/adp5589-keys.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
    index bdd264459a97..25c9f6344bf2 100644
    --- a/drivers/input/keyboard/adp5589-keys.c
    +++ b/drivers/input/keyboard/adp5589-keys.c
    @@ -942,9 +942,9 @@ static void adp5589_clear_config(void *data)
    adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
    }

    -static int adp5589_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int adp5589_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct adp5589_kpad *kpad;
    const struct adp5589_kpad_platform_data *pdata =
    dev_get_platdata(&client->dev);
    @@ -1054,7 +1054,7 @@ static struct i2c_driver adp5589_driver = {
    .name = KBUILD_MODNAME,
    .pm = &adp5589_dev_pm_ops,
    },
    - .probe = adp5589_probe,
    + .probe_new = adp5589_probe,
    .id_table = adp5589_id,
    };

    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:31    [W:5.510 / U:0.984 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site