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

Commit 27239a14 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

rtc: rtc-da9052: use devm_request_threaded_irq() 



Use devm_request_threaded_irq() to make cleanup paths more simple.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fd5231ce

drivers/rtc/rtc-da9052.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -240,7 +240,8 @@ static int da9052_rtc_probe(struct platform_device *pdev) 
	rtc->da9052 = dev_get_drvdata(pdev->dev.parent);

	rtc->da9052 = dev_get_drvdata(pdev->dev.parent);

	platform_set_drvdata(pdev, rtc);

	platform_set_drvdata(pdev, rtc);

	rtc->irq = platform_get_irq_byname(pdev, "ALM");

	rtc->irq = platform_get_irq_byname(pdev, "ALM");

	ret = request_threaded_irq(rtc->irq, NULL, da9052_rtc_irq,

	ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,

				da9052_rtc_irq,

				IRQF_TRIGGER_LOW | IRQF_ONESHOT,

				IRQF_TRIGGER_LOW | IRQF_ONESHOT,

				"ALM", rtc);

				"ALM", rtc);

	if (ret != 0) {

	if (ret != 0) {
@@ -250,16 +251,10 @@ static int da9052_rtc_probe(struct platform_device *pdev) 




	rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,

	rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,

				       &da9052_rtc_ops, THIS_MODULE);

				       &da9052_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc->rtc)) {

	if (IS_ERR(rtc->rtc))

		ret = PTR_ERR(rtc->rtc);

		return PTR_ERR(rtc->rtc);

		goto err_free_irq;

	}





	return 0;

	return 0;



err_free_irq:

	free_irq(rtc->irq, rtc);

	return ret;

}

}





static int da9052_rtc_remove(struct platform_device *pdev)

static int da9052_rtc_remove(struct platform_device *pdev)
@@ -267,7 +262,6 @@ static int da9052_rtc_remove(struct platform_device *pdev) 
	struct da9052_rtc *rtc = pdev->dev.platform_data;

	struct da9052_rtc *rtc = pdev->dev.platform_data;





	rtc_device_unregister(rtc->rtc);

	rtc_device_unregister(rtc->rtc);

	free_irq(rtc->irq, rtc);

	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);





	return 0;

	return 0;