Commit 8d94da66 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Alexandre Belloni

rtc: rs5c372: Convert to .probe_new()

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in .probe().
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20221021130706.178687-8-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 5418e595
...@@ -791,8 +791,7 @@ static int rs5c_oscillator_setup(struct rs5c372 *rs5c372) ...@@ -791,8 +791,7 @@ static int rs5c_oscillator_setup(struct rs5c372 *rs5c372)
return 0; return 0;
} }
static int rs5c372_probe(struct i2c_client *client, static int rs5c372_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
int err = 0; int err = 0;
int smbus_mode = 0; int smbus_mode = 0;
...@@ -826,11 +825,13 @@ static int rs5c372_probe(struct i2c_client *client, ...@@ -826,11 +825,13 @@ static int rs5c372_probe(struct i2c_client *client,
rs5c372->client = client; rs5c372->client = client;
i2c_set_clientdata(client, rs5c372); i2c_set_clientdata(client, rs5c372);
if (client->dev.of_node) if (client->dev.of_node) {
rs5c372->type = (enum rtc_type) rs5c372->type = (enum rtc_type)
of_device_get_match_data(&client->dev); of_device_get_match_data(&client->dev);
else } else {
const struct i2c_device_id *id = i2c_match_id(rs5c372_id, client);
rs5c372->type = id->driver_data; rs5c372->type = id->driver_data;
}
/* we read registers 0x0f then 0x00-0x0f; skip the first one */ /* we read registers 0x0f then 0x00-0x0f; skip the first one */
rs5c372->regs = &rs5c372->buf[1]; rs5c372->regs = &rs5c372->buf[1];
...@@ -920,7 +921,7 @@ static struct i2c_driver rs5c372_driver = { ...@@ -920,7 +921,7 @@ static struct i2c_driver rs5c372_driver = {
.name = "rtc-rs5c372", .name = "rtc-rs5c372",
.of_match_table = of_match_ptr(rs5c372_of_match), .of_match_table = of_match_ptr(rs5c372_of_match),
}, },
.probe = rs5c372_probe, .probe_new = rs5c372_probe,
.remove = rs5c372_remove, .remove = rs5c372_remove,
.id_table = rs5c372_id, .id_table = rs5c372_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment