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 284/606] leds: pca9532: 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/leds/leds-pca9532.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
    index df83d97cb479..15b1acfa442e 100644
    --- a/drivers/leds/leds-pca9532.c
    +++ b/drivers/leds/leds-pca9532.c
    @@ -50,8 +50,7 @@ struct pca9532_data {
    u8 psc[2];
    };

    -static int pca9532_probe(struct i2c_client *client,
    - const struct i2c_device_id *id);
    +static int pca9532_probe(struct i2c_client *client);
    static void pca9532_remove(struct i2c_client *client);

    enum {
    @@ -103,7 +102,7 @@ static struct i2c_driver pca9532_driver = {
    .name = "leds-pca953x",
    .of_match_table = of_match_ptr(of_pca9532_leds_match),
    },
    - .probe = pca9532_probe,
    + .probe_new = pca9532_probe,
    .remove = pca9532_remove,
    .id_table = pca9532_id,
    };
    @@ -504,9 +503,9 @@ pca9532_of_populate_pdata(struct device *dev, struct device_node *np)
    return pdata;
    }

    -static int pca9532_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int pca9532_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    int devid;
    struct pca9532_data *data = i2c_get_clientdata(client);
    struct pca9532_platform_data *pca9532_pdata =
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:36    [W:2.378 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site