Skip to content

Commit fbae853

Browse files
glneoalexandrebelloni
authored andcommitted
rtc: rx8025: Remove use of i2c_match_id()
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-7-afd@ti.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent c79e613 commit fbae853

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/rtc/rtc-rx8025.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,6 @@ static const struct attribute_group rx8025_attr_group = {
522522

523523
static int rx8025_probe(struct i2c_client *client)
524524
{
525-
const struct i2c_device_id *id = i2c_match_id(rx8025_id, client);
526525
struct i2c_adapter *adapter = client->adapter;
527526
struct rx8025_data *rx8025;
528527
int err = 0;
@@ -540,8 +539,7 @@ static int rx8025_probe(struct i2c_client *client)
540539

541540
i2c_set_clientdata(client, rx8025);
542541

543-
if (id)
544-
rx8025->model = id->driver_data;
542+
rx8025->model = (uintptr_t)i2c_get_match_data(client);
545543

546544
err = rx8025_init_client(client);
547545
if (err)

0 commit comments

Comments
 (0)