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 07/27] rtc: rtc-ds1390: use devm_*() functions
Date: Mon, 01 Apr 2013 18:44:31 +0900 [thread overview]
Message-ID: <001201ce2ebd$82ac7540$88055fc0$%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-ds1390.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index f994257..33e51c6 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -131,7 +131,7 @@ static int ds1390_probe(struct spi_device *spi)
spi->bits_per_word = 8;
spi_setup(spi);
- chip = kzalloc(sizeof *chip, GFP_KERNEL);
+ chip = devm_kzalloc(&spi->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) {
dev_err(&spi->dev, "unable to allocate device memory\n");
return -ENOMEM;
@@ -141,16 +141,14 @@ static int ds1390_probe(struct spi_device *spi)
res = ds1390_get_reg(&spi->dev, DS1390_REG_SECONDS, &tmp);
if (res != 0) {
dev_err(&spi->dev, "unable to read device\n");
- kfree(chip);
return res;
}
- chip->rtc = rtc_device_register("ds1390",
- &spi->dev, &ds1390_rtc_ops, THIS_MODULE);
+ chip->rtc = devm_rtc_device_register(&spi->dev, "ds1390",
+ &ds1390_rtc_ops, THIS_MODULE);
if (IS_ERR(chip->rtc)) {
dev_err(&spi->dev, "unable to register device\n");
res = PTR_ERR(chip->rtc);
- kfree(chip);
}
return res;
@@ -158,11 +156,6 @@ static int ds1390_probe(struct spi_device *spi)
static int ds1390_remove(struct spi_device *spi)
{
- struct ds1390 *chip = spi_get_drvdata(spi);
-
- rtc_device_unregister(chip->rtc);
- kfree(chip);
-
return 0;
}
--
1.7.2.5
next prev parent reply other threads:[~2013-04-01 9:45 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 ` Jingoo Han [this message]
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 ` [PATCH 18/27] rtc: rtc-pcf50633: " Jingoo Han
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='001201ce2ebd$82ac7540$88055fc0$%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
all inboxes | Powered by JetHome®