]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rtc: rs5c372: Remove use of i2c_match_id()
authorAndrew Davis <afd@ti.com>
Thu, 5 Mar 2026 19:35:43 +0000 (13:35 -0600)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 12 Mar 2026 14:15:23 +0000 (15:15 +0100)
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>
Link: https://patch.msgid.link/20260305193545.796294-5-afd@ti.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-rs5c372.c

index f8fab0205f8cc659932870ce15c0c3137ebbcccf..936f4f05c8c7a81f1f3f5b8550aacfb38f6814ff 100644 (file)
@@ -825,12 +825,7 @@ static int rs5c372_probe(struct i2c_client *client)
 
        rs5c372->client = client;
        i2c_set_clientdata(client, rs5c372);
-       if (client->dev.of_node) {
-               rs5c372->type = (uintptr_t)of_device_get_match_data(&client->dev);
-       } else {
-               const struct i2c_device_id *id = i2c_match_id(rs5c372_id, client);
-               rs5c372->type = id->driver_data;
-       }
+       rs5c372->type = (uintptr_t)i2c_get_match_data(client);
 
        /* we read registers 0x0f then 0x00-0x0f; skip the first one */
        rs5c372->regs = &rs5c372->buf[1];