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

Commit 23e53be9 authored by Wan ZongShun's avatar Wan ZongShun Committed by Linus Torvalds
Browse files

rtc/nuc900: modify enable/disable IRQs and driver data setting location 



This patch does two modifications:

(1) Adjust enable/disable IRQs location,enable it after rtc
    registration and disable it prior to unregistration.

(2) Put 'platform_set_drvdata(pdev, nuc900_rtc)' in front of rtc
    registration still be safety, though there is no need to do this, when
    I move enable irq after rtc registration, I think still put
    'platform_set_drvdata' before rtc registration that would be a good
    habit.

Signed-off-by: default avatarWan ZongShun <mcuos.com@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 84f20a69

drivers/rtc/rtc-nuc900.c

+12 −11
Original line number Diff line number Diff line
@@ -269,29 +269,30 @@ static int __devinit nuc900_rtc_probe(struct platform_device *pdev) 
		goto fail2;

	}



	nuc900_rtc->irq_num = platform_get_irq(pdev, 0);

	if (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt,

				IRQF_DISABLED, "nuc900rtc", nuc900_rtc)) {

		dev_err(&pdev->dev, "NUC900 RTC request irq failed\n");

		err = -EBUSY;

		goto fail3;

	}

	platform_set_drvdata(pdev, nuc900_rtc);



	nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev,

						&nuc900_rtc_ops, THIS_MODULE);

	if (IS_ERR(nuc900_rtc->rtcdev)) {

		dev_err(&pdev->dev, "rtc device register faild\n");

		err = PTR_ERR(nuc900_rtc->rtcdev);

		goto fail4;

		goto fail3;

	}



	platform_set_drvdata(pdev, nuc900_rtc);

	__raw_writel(__raw_readl(nuc900_rtc->rtc_reg + REG_RTC_TSSR) | MODE24,

					nuc900_rtc->rtc_reg + REG_RTC_TSSR);



	nuc900_rtc->irq_num = platform_get_irq(pdev, 0);

	if (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt,

				IRQF_DISABLED, "nuc900rtc", nuc900_rtc)) {

		dev_err(&pdev->dev, "NUC900 RTC request irq failed\n");

		err = -EBUSY;

		goto fail4;

	}



	return 0;



fail4:	free_irq(nuc900_rtc->irq_num, nuc900_rtc);

fail4:	rtc_device_unregister(nuc900_rtc->rtcdev);

fail3:	iounmap(nuc900_rtc->rtc_reg);

fail2:	release_mem_region(res->start, resource_size(res));

fail1:	kfree(nuc900_rtc);
@@ -303,8 +304,8 @@ static int __devexit nuc900_rtc_remove(struct platform_device *pdev) 
	struct nuc900_rtc *nuc900_rtc = platform_get_drvdata(pdev);

	struct resource *res;



	rtc_device_unregister(nuc900_rtc->rtcdev);

	free_irq(nuc900_rtc->irq_num, nuc900_rtc);

	rtc_device_unregister(nuc900_rtc->rtcdev);

	iounmap(nuc900_rtc->rtc_reg);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);