diff mbox series

[32/59] rtc: x1205: stop using deprecated RTC API

Message ID 20201119114149.4117-33-brgl@bgdev.pl
State Rejected
Headers show
Series rtc: remove all uses of devm_rtc_device_register() | expand

Commit Message

Bartosz Golaszewski Nov. 19, 2020, 11:41 a.m. UTC
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

devm_rtc_device_register() is deprecated. Use devm_rtc_allocate_device()
and devm_rtc_register_device() pair instead.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 drivers/rtc/rtc-x1205.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index d1d5a44d9122..b1232ebf3ee9 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -629,12 +629,11 @@  static int x1205_probe(struct i2c_client *client,
 	if (x1205_validate_client(client) < 0)
 		return -ENODEV;
 
-	rtc = devm_rtc_device_register(&client->dev, x1205_driver.driver.name,
-					&x1205_rtc_ops, THIS_MODULE);
-
+	rtc = devm_rtc_allocate_device(&client->dev);
 	if (IS_ERR(rtc))
 		return PTR_ERR(rtc);
 
+	rtc->ops = &x1205_rtc_ops;
 	i2c_set_clientdata(client, rtc);
 
 	/* Check for power failures and eventually enable the osc */
@@ -655,7 +654,7 @@  static int x1205_probe(struct i2c_client *client,
 	if (err)
 		dev_err(&client->dev, "Unable to create sysfs entries\n");
 
-	return 0;
+	return devm_rtc_register_device(rtc);
 }
 
 static int x1205_remove(struct i2c_client *client)