From: Alexandre Belloni Date: Thu, 17 May 2018 20:53:25 +0000 (+0200) Subject: rtc: ls1x: switch to rtc_register_device X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~5177^2~39 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=52f0e7bc19fb1397aa9d29f87415f94d39bb8b01;p=mirror_ubuntu-focal-kernel.git rtc: ls1x: switch to rtc_register_device This allows for future improvement of the driver. Signed-off-by: Alexandre Belloni --- diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c index de86f9fabc11..609bd1d013f0 100644 --- a/drivers/rtc/rtc-ls1x.c +++ b/drivers/rtc/rtc-ls1x.c @@ -173,15 +173,15 @@ static int ls1x_rtc_probe(struct platform_device *pdev) while (readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_TTS) usleep_range(1000, 3000); - rtcdev = devm_rtc_device_register(&pdev->dev, "ls1x-rtc", - &ls1x_rtc_ops , THIS_MODULE); - if (IS_ERR(rtcdev)) { - ret = PTR_ERR(rtcdev); - goto err; - } + rtcdev = devm_rtc_allocate_device(&pdev->dev); + if (IS_ERR(rtcdev)) + return PTR_ERR(rtcdev); platform_set_drvdata(pdev, rtcdev); - return 0; + rtcdev->ops = &ls1x_rtc_ops; + + return rtc_register_device(rtcdev); + err: return ret; }