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

    diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
    index ea3c8672b85a..d4944fc1feb1 100644
    --- a/drivers/mfd/stmpe-i2c.c
    +++ b/drivers/mfd/stmpe-i2c.c
    @@ -67,8 +67,9 @@ static const struct of_device_id stmpe_of_match[] = {
    MODULE_DEVICE_TABLE(of, stmpe_of_match);

    static int
    -stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
    +stmpe_i2c_probe(struct i2c_client *i2c)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
    enum stmpe_partnum partnum;
    const struct of_device_id *of_id;

    @@ -117,7 +118,7 @@ static struct i2c_driver stmpe_i2c_driver = {
    .pm = pm_sleep_ptr(&stmpe_dev_pm_ops),
    .of_match_table = stmpe_of_match,
    },
    - .probe = stmpe_i2c_probe,
    + .probe_new = stmpe_i2c_probe,
    .remove = stmpe_i2c_remove,
    .id_table = stmpe_i2c_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:44    [W:2.633 / U:1.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site