lkml.org 
[lkml]   [2024]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/31] hwmon: (shtc1) Remove use of i2c_match_id()
    Date
    The function i2c_match_id() is used to fetch the matching ID from
    the i2c_device_id table. This is often used to then retrieve the
    matching driver_data. This can be done in one step with the helper
    i2c_get_match_data().

    This helper has a couple other benefits:
    * It doesn't need the i2c_device_id passed in so we do not need
    to have that forward declared, allowing us to remove those or
    move the i2c_device_id table down to its more natural spot
    with the other module info.
    * It also checks for device match data, which allows for OF and
    ACPI based probing. That means we do not have to manually check
    those first and can remove those checks.

    Signed-off-by: Andrew Davis <afd@ti.com>
    ---
    drivers/hwmon/shtc1.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c
    index 1f96e94967ee8..24a8ae092d00e 100644
    --- a/drivers/hwmon/shtc1.c
    +++ b/drivers/hwmon/shtc1.c
    @@ -186,8 +186,6 @@ static void shtc1_select_command(struct shtc1_data *data)
    }
    }

    -static const struct i2c_device_id shtc1_id[];
    -
    static int shtc1_probe(struct i2c_client *client)
    {
    int ret;
    @@ -195,7 +193,7 @@ static int shtc1_probe(struct i2c_client *client)
    char id_reg_buf[2];
    struct shtc1_data *data;
    struct device *hwmon_dev;
    - enum shtcx_chips chip = i2c_match_id(shtc1_id, client)->driver_data;
    + enum shtcx_chips chip = (uintptr_t)i2c_get_match_data(client);
    struct i2c_adapter *adap = client->adapter;
    struct device *dev = &client->dev;
    struct device_node *np = dev->of_node;
    --
    2.39.2

    \
     
     \ /
      Last update: 2024-05-27 16:22    [W:4.285 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site