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 052/606] iio: accel: bmc150: 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/iio/accel/bmc150-accel-i2c.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c
    index be8cc598b88e..509cab2bd694 100644
    --- a/drivers/iio/accel/bmc150-accel-i2c.c
    +++ b/drivers/iio/accel/bmc150-accel-i2c.c
    @@ -171,9 +171,9 @@ static void bmc150_acpi_dual_accel_probe(struct i2c_client *client) {}
    static void bmc150_acpi_dual_accel_remove(struct i2c_client *client) {}
    #endif

    -static int bmc150_accel_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int bmc150_accel_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct regmap *regmap;
    const char *name = NULL;
    enum bmc150_type type = BOSCH_UNKNOWN;
    @@ -269,7 +269,7 @@ static struct i2c_driver bmc150_accel_driver = {
    .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
    .pm = &bmc150_accel_pm_ops,
    },
    - .probe = bmc150_accel_probe,
    + .probe_new = bmc150_accel_probe,
    .remove = bmc150_accel_remove,
    .id_table = bmc150_accel_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-18 23:50    [W:4.020 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site