Commit e788771c authored by Bruno Thomsen's avatar Bruno Thomsen Committed by Alexandre Belloni
Browse files

rtc: pcf2127: convert to devm_rtc_allocate_device

parent b60ff2cf
Loading
Loading
Loading
Loading
+4 −3
Original line number Original line Diff line number Diff line
@@ -237,11 +237,12 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,


	dev_set_drvdata(dev, pcf2127);
	dev_set_drvdata(dev, pcf2127);


	pcf2127->rtc = devm_rtc_device_register(dev, name, &pcf2127_rtc_ops,
	pcf2127->rtc = devm_rtc_allocate_device(dev);
						THIS_MODULE);
	if (IS_ERR(pcf2127->rtc))
	if (IS_ERR(pcf2127->rtc))
		return PTR_ERR(pcf2127->rtc);
		return PTR_ERR(pcf2127->rtc);


	pcf2127->rtc->ops = &pcf2127_rtc_ops;

	if (has_nvmem) {
	if (has_nvmem) {
		struct nvmem_config nvmem_cfg = {
		struct nvmem_config nvmem_cfg = {
			.priv = pcf2127,
			.priv = pcf2127,
@@ -253,7 +254,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
		ret = rtc_nvmem_register(pcf2127->rtc, &nvmem_cfg);
		ret = rtc_nvmem_register(pcf2127->rtc, &nvmem_cfg);
	}
	}


	return ret;
	return rtc_register_device(pcf2127->rtc);
}
}


#ifdef CONFIG_OF
#ifdef CONFIG_OF