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

    diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
    index f6b4b9d94bbd..62be2326c9b2 100644
    --- a/drivers/mfd/twl-core.c
    +++ b/drivers/mfd/twl-core.c
    @@ -754,8 +754,9 @@ static struct of_dev_auxdata twl_auxdata_lookup[] = {

    /* NOTE: This driver only handles a single twl4030/tps659x0 chip */
    static int
    -twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
    +twl_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct device_node *node = client->dev.of_node;
    struct platform_device *pdev;
    const struct regmap_config *twl_regmap_config;
    @@ -955,7 +956,7 @@ static struct i2c_driver twl_driver = {
    .driver.name = DRIVER_NAME,
    .driver.pm = &twl_dev_pm_ops,
    .id_table = twl_ids,
    - .probe = twl_probe,
    + .probe_new = twl_probe,
    .remove = twl_remove,
    };
    builtin_i2c_driver(twl_driver);
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:39    [W:4.048 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site