Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c7293e7 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: at91sam9: convert to devm_rtc_allocate_device 



This allows further improvement of the driver.

Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 1a76a77c

drivers/rtc/rtc-at91sam9.c

+4 −3
Original line number Diff line number Diff line
@@ -418,13 +418,14 @@ static int at91_rtc_probe(struct platform_device *pdev) 
	mr &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);

	rtt_writel(rtc, MR, mr);



	rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,

					&at91_rtc_ops, THIS_MODULE);

	rtc->rtcdev = devm_rtc_allocate_device(&pdev->dev);

	if (IS_ERR(rtc->rtcdev)) {

		ret = PTR_ERR(rtc->rtcdev);

		goto err_clk;

	}



	rtc->rtcdev->ops = &at91_rtc_ops;



	/* register irq handler after we know what name we'll use */

	ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,

			       IRQF_SHARED | IRQF_COND_SUSPEND,
@@ -444,7 +445,7 @@ static int at91_rtc_probe(struct platform_device *pdev) 
		dev_warn(&pdev->dev, "%s: SET TIME!\n",

				dev_name(&rtc->rtcdev->dev));



	return 0;

	return rtc_register_device(rtc->rtcdev);



err_clk:

	clk_disable_unprepare(rtc->sclk);