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

Commit d64132ac authored by Sachin Kamat's avatar Sachin Kamat Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-at32ap700x.c: use devm_* APIs 



devm_* functions are device managed and make cleanup code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Cc: Jingoo 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 3087b3d0

drivers/rtc/rtc-at32ap700x.c

+9 −18
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
	int irq;

	int ret;



	rtc = kzalloc(sizeof(struct rtc_at32ap700x), GFP_KERNEL);

	rtc = devm_kzalloc(&pdev->dev, sizeof(struct rtc_at32ap700x),

			   GFP_KERNEL);

	if (!rtc) {

		dev_dbg(&pdev->dev, "out of memory\n");

		return -ENOMEM;
@@ -223,7 +224,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
	}



	rtc->irq = irq;

	rtc->regs = ioremap(regs->start, resource_size(regs));

	rtc->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));

	if (!rtc->regs) {

		ret = -ENOMEM;

		dev_dbg(&pdev->dev, "could not map I/O memory\n");
@@ -244,20 +245,21 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
				| RTC_BIT(CTRL_EN));

	}



	ret = request_irq(irq, at32_rtc_interrupt, IRQF_SHARED, "rtc", rtc);

	ret = devm_request_irq(&pdev->dev, irq, at32_rtc_interrupt, IRQF_SHARED,

				"rtc", rtc);

	if (ret) {

		dev_dbg(&pdev->dev, "could not request irq %d\n", irq);

		goto out_iounmap;

		goto out;

	}



	platform_set_drvdata(pdev, rtc);



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

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

				&at32_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc->rtc)) {

		dev_dbg(&pdev->dev, "could not register rtc device\n");

		ret = PTR_ERR(rtc->rtc);

		goto out_free_irq;

		goto out;

	}



	device_init_wakeup(&pdev->dev, 1);
@@ -267,26 +269,15 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 


	return 0;



out_free_irq:

	platform_set_drvdata(pdev, NULL);

	free_irq(irq, rtc);

out_iounmap:

	iounmap(rtc->regs);

out:

	kfree(rtc);

	platform_set_drvdata(pdev, NULL);

	return ret;

}



static int __exit at32_rtc_remove(struct platform_device *pdev)

{

	struct rtc_at32ap700x *rtc = platform_get_drvdata(pdev);



	device_init_wakeup(&pdev->dev, 0);



	free_irq(rtc->irq, rtc);

	iounmap(rtc->regs);

	rtc_device_unregister(rtc->rtc);

	kfree(rtc);

	platform_set_drvdata(pdev, NULL);



	return 0;