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 602/606] ASoC: max98396: 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>
    ---
    sound/soc/codecs/max98396.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/codecs/max98396.c b/sound/soc/codecs/max98396.c
    index a7b6a23f2cd8..db3de41f10e0 100644
    --- a/sound/soc/codecs/max98396.c
    +++ b/sound/soc/codecs/max98396.c
    @@ -1731,9 +1731,9 @@ static void max98396_supply_disable(void *r)
    regulator_disable((struct regulator *) r);
    }

    -static int max98396_i2c_probe(struct i2c_client *i2c,
    - const struct i2c_device_id *id)
    +static int max98396_i2c_probe(struct i2c_client *i2c)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
    struct max98396_priv *max98396 = NULL;
    int i, ret, reg;

    @@ -1907,7 +1907,7 @@ static struct i2c_driver max98396_i2c_driver = {
    .acpi_match_table = ACPI_PTR(max98396_acpi_match),
    .pm = &max98396_pm,
    },
    - .probe = max98396_i2c_probe,
    + .probe_new = max98396_i2c_probe,
    .id_table = max98396_i2c_id,
    };

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