From: Jingoo Han <jg1.han@samsung.com>
To: "'Andrew Morton'" <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
"'Alessandro Zummo'" <a.zummo@towertech.it>,
rtc-linux@googlegroups.com, "'Jingoo Han'" <jg1.han@samsung.com>
Subject: [PATCH 05/30] rtc: rtc-davinci: use devm_rtc_device_register()
Date: Wed, 06 Mar 2013 14:28:39 +0900 [thread overview]
Message-ID: <004701ce1a2b$7569d8b0$603d8a10$%han@samsung.com> (raw)
In-Reply-To: <004301ce1a2b$3ad77e00$b0867a00$%han@samsung.com>
devm_rtc_device_register() is device managed and makes cleanup
paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/rtc/rtc-davinci.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
index db877e0..8b49f7a 100644
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -523,7 +523,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, davinci_rtc);
- davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+ davinci_rtc->rtc = devm_rtc_device_register(pdev->name, &pdev->dev,
&davinci_rtc_ops, THIS_MODULE);
if (IS_ERR(davinci_rtc->rtc)) {
ret = PTR_ERR(davinci_rtc->rtc);
@@ -543,7 +543,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
0, "davinci_rtc", davinci_rtc);
if (ret < 0) {
dev_err(dev, "unable to register davinci RTC interrupt\n");
- goto fail2;
+ goto fail1;
}
/* Enable interrupts */
@@ -557,8 +557,6 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
return 0;
-fail2:
- rtc_device_unregister(davinci_rtc->rtc);
fail1:
platform_set_drvdata(pdev, NULL);
return ret;
@@ -572,8 +570,6 @@ static int __exit davinci_rtc_remove(struct platform_device *pdev)
rtcif_write(davinci_rtc, 0, PRTCIF_INTEN);
- rtc_device_unregister(davinci_rtc->rtc);
-
platform_set_drvdata(pdev, NULL);
return 0;
--
1.7.2.5
next prev parent reply other threads:[~2013-03-06 5:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-06 5:27 [PATCH 01/30] rtc: rtc-88pm80x: use devm_rtc_device_register() Jingoo Han
2013-03-06 5:27 ` [PATCH 02/30] rtc: rtc-coh90133: " Jingoo Han
2013-03-06 5:28 ` [PATCH 03/30] rtc: rtc-da9052: " Jingoo Han
2013-03-06 5:28 ` [PATCH 04/30] rtc: rtc-da9055: " Jingoo Han
2013-03-06 5:28 ` Jingoo Han [this message]
2013-03-06 5:29 ` [PATCH 06/30] rtc: rtc-ds1511: " Jingoo Han
2013-03-06 5:29 ` [PATCH 07/30] rtc: rtc-ds1553: " Jingoo Han
2013-03-06 5:29 ` [PATCH 08/30] rtc: rtc-ds1742: " Jingoo Han
2013-03-06 5:30 ` [PATCH 09/30] rtc: rtc-ep93xx: " Jingoo Han
2013-03-06 5:30 ` [PATCH 10/30] rtc: rtc-imxdi: " Jingoo Han
2013-03-06 5:30 ` [PATCH 11/30] rtc: rtc-lp8788: " Jingoo Han
2013-03-06 5:31 ` [PATCH 12/30] rtc: rtc-lpc32xx: " Jingoo Han
2013-03-06 5:31 ` [PATCH 13/30] rtc: rtc-max77686: " Jingoo Han
2013-03-06 5:31 ` [PATCH 14/30] rtc: rtc-max8907: " Jingoo Han
2013-03-06 5:32 ` [PATCH 15/30] rtc: rtc-max8997: " Jingoo Han
2013-03-06 5:32 ` [PATCH 16/30] rtc: rtc-mv: " Jingoo Han
2013-03-06 5:32 ` [PATCH 17/30] rtc: rtc-mxc: " Jingoo Han
2013-03-06 5:33 ` [PATCH 18/30] rtc: rtc-palmas: " Jingoo Han
2013-03-06 5:33 ` [PATCH 19/30] rtc: rtc-pcf8523: " Jingoo Han
2013-03-06 5:33 ` [PATCH 20/30] rtc: rtc-s3c: " Jingoo Han
2013-03-06 5:34 ` [PATCH 21/30] rtc: rtc-snvs: " Jingoo Han
2013-03-06 5:34 ` [PATCH 22/30] rtc: rtc-spear: " Jingoo Han
2013-03-06 5:34 ` [PATCH 23/30] rtc: rtc-stk17ta8: " Jingoo Han
2013-03-06 5:35 ` [PATCH 24/30] rtc: rtc-tegra: " Jingoo Han
2013-03-06 5:35 ` [PATCH 25/30] rtc: rtc-tps6586x: " Jingoo Han
2013-03-06 5:35 ` [PATCH 26/30] rtc: rtc-tps65910: " Jingoo Han
2013-03-06 5:36 ` [PATCH 27/30] rtc: rtc-tps80031: " Jingoo Han
2013-03-06 5:36 ` [PATCH 28/30] rtc: rtc-tx4939: " Jingoo Han
2013-03-06 5:36 ` [PATCH 29/30] rtc: rtc-vt8500: " Jingoo Han
2013-03-06 5:37 ` [PATCH 30/30] rtc: rtc-wm831x: " Jingoo Han
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='004701ce1a2b$7569d8b0$603d8a10$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=a.zummo@towertech.it \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox