[PATCH 35/59] rtc: rx8025: stop using deprecated RTC API

Bartosz Golaszewski
2020-11-19T11:43:39Z

drivers/rtc/rtc-rx8025.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index a24f85893f90..3c08cfa779d7 100644
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -524,12 +524,9 @@ static int rx8025_probe(struct i2c_client *client,
if (err)
return err;

- rx8025->rtc = devm_rtc_device_register(&client->dev, client->name,
- &rx8025_rtc_ops, THIS_MODULE);
- if (IS_ERR(rx8025->rtc)) {
- dev_err(&client->dev, "unable to register the class device\n");
+ rx8025->rtc = devm_rtc_allocate_device(&client->dev);
+ if (IS_ERR(rx8025->rtc))
return PTR_ERR(rx8025->rtc);
- }

if (client->irq > 0) {
dev_info(&client->dev, "IRQ %d supplied\n", client->irq);
@@ -543,13 +540,15 @@ static int rx8025_probe(struct i2c_client *client,
}
}

+ rx8025->rtc->ops = &rx8025_rtc_ops;
rx8025->rtc->max_user_freq = 1;

/* the rx8025 alarm only supports a minute accuracy */
rx8025->rtc->uie_unsupported = 1;

err = rx8025_sysfs_register(&client->dev);
- return err;
+
+ return devm_rtc_register_device(rx8025->rtc);
}

static int rx8025_remove(struct i2c_client *client)
--
2.29.1