Commit b1c67e0b authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: davinci: convert to devm_rtc_allocate_device

This allows further improvement of the driver. Also remove the unnecessary
error string as the core will already display error messages.

Link: https://lore.kernel.org/r/20200305215022.32533-1-alexandre.belloni@bootlin.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 09b875a4
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -485,13 +485,11 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)

	platform_set_drvdata(pdev, davinci_rtc);

	davinci_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
				    &davinci_rtc_ops, THIS_MODULE);
	if (IS_ERR(davinci_rtc->rtc)) {
		dev_err(dev, "unable to register RTC device, err %d\n",
				ret);
	davinci_rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
	if (IS_ERR(davinci_rtc->rtc))
		return PTR_ERR(davinci_rtc->rtc);
	}

	davinci_rtc->rtc->ops = &davinci_rtc_ops;

	rtcif_write(davinci_rtc, PRTCIF_INTFLG_RTCSS, PRTCIF_INTFLG);
	rtcif_write(davinci_rtc, 0, PRTCIF_INTEN);
@@ -516,7 +514,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)

	device_init_wakeup(&pdev->dev, 0);

	return 0;
	return rtc_register_device(davinci_rtc->rtc);
}

static int __exit davinci_rtc_remove(struct platform_device *pdev)