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 18/27] rtc: rtc-pcf50633: use devm_*() functions
Date: Mon, 01 Apr 2013 18:48:02 +0900 [thread overview]
Message-ID: <001d01ce2ebe$0048ad70$00da0850$%han@samsung.com> (raw)
In-Reply-To: <000c01ce2ebd$2a1307f0$7e3917d0$%han@samsung.com>
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/rtc/rtc-pcf50633.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
index e9f3135..e6b6911 100644
--- a/drivers/rtc/rtc-pcf50633.c
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -252,20 +252,17 @@ static int pcf50633_rtc_probe(struct platform_device *pdev)
{
struct pcf50633_rtc *rtc;
- rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
+ rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
if (!rtc)
return -ENOMEM;
rtc->pcf = dev_to_pcf50633(pdev->dev.parent);
platform_set_drvdata(pdev, rtc);
- rtc->rtc_dev = rtc_device_register("pcf50633-rtc", &pdev->dev,
+ rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "pcf50633-rtc",
&pcf50633_rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc->rtc_dev)) {
- int ret = PTR_ERR(rtc->rtc_dev);
- kfree(rtc);
- return ret;
- }
+ if (IS_ERR(rtc->rtc_dev))
+ return PTR_ERR(rtc->rtc_dev);
pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,
pcf50633_rtc_irq, rtc);
@@ -277,12 +274,8 @@ static int pcf50633_rtc_remove(struct platform_device *pdev)
struct pcf50633_rtc *rtc;
rtc = platform_get_drvdata(pdev);
-
pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM);
- rtc_device_unregister(rtc->rtc_dev);
- kfree(rtc);
-
return 0;
}
--
1.7.2.5
next prev parent reply other threads:[~2013-04-01 9:48 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-01 9:42 [PATCH 01/27] rtc: rtc-ab8500: " Jingoo Han
2013-04-01 9:42 ` [PATCH 02/27] rtc: rtc-at91sam9: " Jingoo Han
2013-04-01 9:43 ` [PATCH 03/27] rtc: rtc-bfin: " Jingoo Han
2013-04-01 9:43 ` [PATCH 04/27] rtc: rtc-bq4802: " Jingoo Han
2013-04-01 9:43 ` [PATCH 05/27] rtc: rtc-ds1216: " Jingoo Han
2013-04-01 9:44 ` [PATCH 06/27] rtc: rtc-ds1286: " Jingoo Han
2013-04-01 9:44 ` [PATCH 07/27] rtc: rtc-ds1390: " Jingoo Han
2013-04-01 9:44 ` [PATCH 08/27] rtc: rtc-ds2404: " Jingoo Han
2013-04-01 9:45 ` [PATCH 09/27] rtc: rtc-fm3130: " Jingoo Han
2013-04-01 9:45 ` [PATCH 10/27] rtc: rtc-isl12022: " Jingoo Han
2013-04-01 9:45 ` [PATCH 11/27] rtc: rtc-m41t80: " Jingoo Han
2013-04-01 9:46 ` [PATCH 12/27] rtc: rtc-max8998: " Jingoo Han
2013-04-01 9:46 ` [PATCH 13/27] rtc: rtc-mc13xxx: " Jingoo Han
2013-04-01 9:46 ` [PATCH 14/27] rtc: rtc-msm6242: " Jingoo Han
2013-04-01 9:47 ` [PATCH 15/27] rtc: rtc-nuc900: " Jingoo Han
2013-04-01 9:47 ` [PATCH 16/27] rtc: rtc-pcap: " Jingoo Han
2013-04-01 9:47 ` [PATCH 17/27] rtc: rtc-pcf2123: " Jingoo Han
2013-04-01 9:48 ` Jingoo Han [this message]
2013-04-01 9:48 ` [PATCH 19/27] rtc: rtc-pcf8563: " Jingoo Han
2013-04-01 9:48 ` [PATCH 20/27] rtc: rtc-pcf8583: " Jingoo Han
2013-04-01 9:48 ` [PATCH 21/27] rtc: rtc-rp5c01: " Jingoo Han
2013-04-01 9:49 ` [PATCH 22/27] rtc: rtc-rs5c348: " Jingoo Han
2013-04-01 9:49 ` [PATCH 23/27] rtc: rtc-rs5c372: " Jingoo Han
2013-04-01 9:49 ` [PATCH 24/27] rtc: rtc-s35390a: " Jingoo Han
2013-04-01 9:50 ` [PATCH 25/27] rtc: rtc-sa1100: " Jingoo Han
2013-04-01 9:50 ` [PATCH 26/27] rtc: rtc-stmp3xxx: " Jingoo Han
2013-04-01 9:50 ` [PATCH 27/27] rtc: rtc-v3020: " 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='001d01ce2ebe$0048ad70$00da0850$%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
Powered by JetHome