diff mbox series

[43/45] rtc: tx4939: switch to rtc_register_device

Message ID	20180212224759.15999-44-alexandre.belloni@bootlin.com
State	Accepted
Headers	show Return-Path: <linux-rtc-owner@vger.kernel.org> From: Alexandre Belloni <alexandre.belloni@bootlin.com> To: linux-rtc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexandre Belloni <alexandre.belloni@bootlin.com> Subject: [PATCH 43/45] rtc: tx4939: switch to rtc_register_device Date: Mon, 12 Feb 2018 23:47:57 +0100 Message-Id: <20180212224759.15999-44-alexandre.belloni@bootlin.com> In-Reply-To: <20180212224759.15999-1-alexandre.belloni@bootlin.com> References: <20180212224759.15999-1-alexandre.belloni@bootlin.com> Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk
Series	RTC: nvmem improvements \| expand [00/45] RTC: nvmem improvements [01/45] rtc: documentation: correct nvmem date and version [02/45] rtc: nvmem: pass nvmem_config to rtc_nvmem_register() [03/45] rtc: nvmem: return error values [04/45] rtc: nvmem: disallow registering nvmem more than once [05/45] rtc: export rtc_nvmem_register() to drivers [06/45] rtc: ds1305: call rtc_nvmem_register() [07/45] rtc: ds1305: put ds1305_nvmem_cfg on the stack [08/45] rtc: ds1307: call rtc_nvmem_register() [09/45] rtc: ds1307: put struct nvmem_config on the stack [10/45] rtc: ds1511: call rtc_nvmem_register() [11/45] rtc: ds1511: put ds1511_nvmem_cfg on the stack [12/45] rtc: m48t86: call rtc_nvmem_register() [13/45] rtc: m48t86: put m48t86_nvmem_cfg on the stack [14/45] rtc: omap: call rtc_nvmem_register() [15/45] rtc: pcf85363: call rtc_nvmem_register() [16/45] rtc: pcf85363: put struct nvmem_config on the stack [17/45] rtc: rv8803: call rtc_nvmem_register() [18/45] rtc: rv8803: put struct nvmem_config on the stack [19/45] rtc: rv8803: fix possible race condition [20/45] rtc: remove nvmem_config [21/45] rtc: ds1343: simplify regmap initialization [22/45] rtc: ds1343: switch to rtc_register_device [23/45] rtc: ds1343: remove undocumented and useless sysfs files [24/45] rtc: ds1343: use generic nvmem [25/45] rtc: m48t59: switch to rtc_register_device [26/45] rtc: m48t59: use generic nvmem [27/45] rtc: sirfsoc: remove useless sirfsoc_rtc_ioctl [28/45] rtc: ds1553: switch to rtc_register_device [29/45] rtc: ds1553: use generic nvmem [30/45] rtc: ds1553: make alarms useful [31/45] rtc: cmos: fix possible race condition [32/45] rtc: cmos: use generic nvmem [33/45] rtc: ds1742: switch to rtc_register_device [34/45] rtc: ds1742: use generic nvmem [35/45] rtc: rp5c01: fix possible race condition [36/45] rtc: rp5c01: use generic nvmem [37/45] rtc: stk17ta8: make alarms useful [38/45] rtc: stk17ta8: switch to rtc_register_device [39/45] rtc: stk17ta8: fix possible race condition [40/45] rtc: stk17ta8: use generic nvmem [41/45] rtc: tx4939: remove arch/mips dependency [42/45] rtc: tx4939: extend test coverage [43/45] rtc: tx4939: switch to rtc_register_device [44/45] rtc: tx4939: fix possible race condition [45/45] rtc: tx4939: use generic nvmem

Commit Message

Alexandre Belloni Feb. 12, 2018, 10:47 p.m. UTC

This allows for future improvement of the driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 drivers/rtc/rtc-tx4939.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index 1f4013d8ae7b..75c3887fbc6c 100644
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -283,10 +283,16 @@  static int __init tx4939_rtc_probe(struct platform_device *pdev)
 	if (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt,
 			     0, pdev->name, &pdev->dev) < 0)
 		return -EBUSY;
-	rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-				  &tx4939_rtc_ops, THIS_MODULE);
+	rtc = devm_rtc_allocate_device(&pdev->dev);
 	if (IS_ERR(rtc))
 		return PTR_ERR(rtc);
+
+	rtc->ops = &tx4939_rtc_ops;
+
+	ret = rtc_register_device(rtc);
+	if (ret)
+		return ret;
+
 	pdata->rtc = rtc;
 	ret = sysfs_create_bin_file(&pdev->dev.kobj, &tx4939_rtc_nvram_attr);