]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rtc: pcf85063: convert to devm_rtc_allocate_device
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 1 Apr 2019 16:08:08 +0000 (18:08 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 4 Apr 2019 08:07:11 +0000 (10:07 +0200)
This allows further improvement of the driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-pcf85063.c

index 559333197fa5602b3ed6ad0ffb793898c9a10f34..7736bf99d57a98b5a1c93d8e793ae97a6030656e 100644 (file)
@@ -28,8 +28,6 @@
 #define PCF85063_REG_SC                        0x04 /* datetime */
 #define PCF85063_REG_SC_OS             0x80
 
-static struct i2c_driver pcf85063_driver;
-
 static int pcf85063_stop_clock(struct i2c_client *client, u8 *ctrl1)
 {
        int rc;
@@ -220,11 +218,13 @@ static int pcf85063_probe(struct i2c_client *client)
                dev_warn(&client->dev, "failed to set xtal load capacitance: %d",
                         err);
 
-       rtc = devm_rtc_device_register(&client->dev,
-                                      pcf85063_driver.driver.name,
-                                      &pcf85063_rtc_ops, THIS_MODULE);
+       rtc = devm_rtc_allocate_device(&client->dev);
+       if (IS_ERR(rtc))
+               return PTR_ERR(rtc);
+
+       rtc->ops = &pcf85063_rtc_ops;
 
-       return PTR_ERR_OR_ZERO(rtc);
+       return rtc_register_device(rtc);
 }
 
 #ifdef CONFIG_OF