]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rtc: pcf2127: convert to devm_rtc_allocate_device
authorBruno Thomsen <bruno.thomsen@gmail.com>
Thu, 22 Aug 2019 13:19:32 +0000 (15:19 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 23 Aug 2019 14:20:50 +0000 (16:20 +0200)
This allows further improvement of the driver.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Link: https://lore.kernel.org/r/20190822131936.18772-1-bruno.thomsen@gmail.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-pcf2127.c

index 8632f58fed43e2228a04f78857c78717a9e91af7..58eb96506e4bc89d4fed65270c1f6426b3cbf4d5 100644 (file)
@@ -237,11 +237,12 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
 
        dev_set_drvdata(dev, pcf2127);
 
-       pcf2127->rtc = devm_rtc_device_register(dev, name, &pcf2127_rtc_ops,
-                                               THIS_MODULE);
+       pcf2127->rtc = devm_rtc_allocate_device(dev);
        if (IS_ERR(pcf2127->rtc))
                return PTR_ERR(pcf2127->rtc);
 
+       pcf2127->rtc->ops = &pcf2127_rtc_ops;
+
        if (has_nvmem) {
                struct nvmem_config nvmem_cfg = {
                        .priv = pcf2127,
@@ -253,7 +254,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
                ret = rtc_nvmem_register(pcf2127->rtc, &nvmem_cfg);
        }
 
-       return ret;
+       return rtc_register_device(pcf2127->rtc);
 }
 
 #ifdef CONFIG_OF