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

Commit 589e5014 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Linus Torvalds
Browse files

rtc: mc13xxx: request IRQs after RTC registration 



Interrupts can appear after request_irq and interrupt handlers can use
the RTC device, but currently we register RTC after IRQs.  This patch
changes this order and simplify error path a bit.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 77bf2ea8

drivers/rtc/rtc-mc13xxx.c

+11 −21
Original line number Diff line number Diff line
@@ -325,6 +325,11 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, priv);



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

					     &mc13xxx_rtc_ops, THIS_MODULE);

	if (IS_ERR(priv->rtc))

		return PTR_ERR(priv->rtc);



	mc13xxx_lock(mc13xxx);



	ret = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_RTCRST,
@@ -342,35 +347,20 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev) 
	ret = mc13xxx_irq_request_nounmask(mc13xxx, MC13XXX_IRQ_1HZ,

			mc13xxx_rtc_update_handler, DRIVER_NAME, priv);

	if (ret)

		goto err_update_irq_request;

		goto err_reset_irq_status;



	ret = mc13xxx_irq_request_nounmask(mc13xxx, MC13XXX_IRQ_TODA,

			mc13xxx_rtc_alarm_handler, DRIVER_NAME, priv);

	if (ret)

		goto err_alarm_irq_request;



	mc13xxx_unlock(mc13xxx);



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

					&mc13xxx_rtc_ops, THIS_MODULE);

	if (IS_ERR(priv->rtc)) {

		ret = PTR_ERR(priv->rtc);



		mc13xxx_lock(mc13xxx);



		mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv);

err_alarm_irq_request:

	if (!ret)

		goto err_reset_irq_request;



	mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_1HZ, priv);

err_update_irq_request:



err_reset_irq_status:



	mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv);

err_reset_irq_request:



err_reset_irq_request:

	mc13xxx_unlock(mc13xxx);

	}



	return ret;

}