alpha: rtc: simplify alpha_rtc_init
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/1 alpha: rtc: simplify alpha_rtc_init
Use devm_rtc_allocate_device to simplify choosing the rtc_ops in alpha_rtc_init().
Signed-off-by Alexandre Belloni <[email protected]>
--- arch/alpha/kernel/rtc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
arch/alpha/kernel/rtc.c +10 -12
@@ -198,26 +198,24 @@ static const struct rtc_class_ops remote_rtc_ops = {static int __init alpha_rtc_init (void ) { -const struct rtc_class_ops *ops;struct platform_device *pdev;struct rtc_device *rtc; -const char *name;init_rtc_epoch (); - name ="rtc-alpha" ; - ops = &alpha_rtc_ops; -#ifdef HAVE_REMOTE_RTC -if (alpha_mv.rtc_boot_cpu_only) - ops = &remote_rtc_ops; -#endif - - pdev =platform_device_register_simple (name,-1 ,NULL ,0 ); - rtc =devm_rtc_device_register (&pdev->dev, name, ops,THIS_MODULE ); + pdev =platform_device_register_simple ("rtc-alpha" ,-1 ,NULL ,0 ); + rtc =devm_rtc_allocate_device (&pdev->dev);if (IS_ERR (rtc))return PTR_ERR (rtc);platform_set_drvdata (pdev, rtc); -return 0 ; + rtc->ops = &alpha_rtc_ops; + +#ifdef HAVE_REMOTE_RTC +if (alpha_mv.rtc_boot_cpu_only) + rtc->ops = &remote_rtc_ops; +#endif + +return rtc_register_device (rtc); }device_initcall (alpha_rtc_init);
Signature · 1 line
2.19.0.rc2