From: Jingoo Han <jg1.han@samsung.com>
To: "'Grant Likely'" <grant.likely@secretlab.ca>
Cc: "'Linus Walleij'" <linus.walleij@linaro.org>,
linux-kernel@vger.kernel.org,
"'Jingoo Han'" <jg1.han@samsung.com>
Subject: [PATCH 4/6] gpio: max732x: use devm_kzalloc()
Date: Fri, 15 Mar 2013 18:15:28 +0900 [thread overview]
Message-ID: <006501ce215d$a275fe40$e761fac0$%han@samsung.com> (raw)
In-Reply-To: <006201ce215d$6f133d10$4d39b730$%han@samsung.com>
Use devm_kzalloc() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/gpio/gpio-max732x.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 1e0467c..d4b51b1 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -589,7 +589,8 @@ static int max732x_probe(struct i2c_client *client,
return -EINVAL;
}
- chip = kzalloc(sizeof(struct max732x_chip), GFP_KERNEL);
+ chip = devm_kzalloc(&client->dev, sizeof(struct max732x_chip),
+ GFP_KERNEL);
if (chip == NULL)
return -ENOMEM;
chip->client = client;
@@ -647,7 +648,6 @@ static int max732x_probe(struct i2c_client *client,
out_failed:
max732x_irq_teardown(chip);
- kfree(chip);
return ret;
}
@@ -680,7 +680,6 @@ static int max732x_remove(struct i2c_client *client)
if (chip->client_dummy)
i2c_unregister_device(chip->client_dummy);
- kfree(chip);
return 0;
}
--
1.7.2.5
next prev parent reply other threads:[~2013-03-15 9:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 9:14 [PATCH 1/6] gpio: adp5520: use devm_kzalloc() Jingoo Han
2013-03-15 9:14 ` [PATCH 2/6] gpio: max7300: " Jingoo Han
2013-03-27 8:47 ` Linus Walleij
2013-03-15 9:15 ` [PATCH 3/6] gpio: max7301: " Jingoo Han
2013-03-27 8:48 ` Linus Walleij
2013-03-15 9:15 ` Jingoo Han [this message]
2013-03-27 8:49 ` [PATCH 4/6] gpio: max732x: " Linus Walleij
2013-03-15 9:15 ` [PATCH 5/6] gpio: mc33880: " Jingoo Han
2013-03-27 8:50 ` Linus Walleij
2013-03-15 9:16 ` [PATCH 6/6] gpio: pcf857x: " Jingoo Han
2013-03-27 8:52 ` Linus Walleij
2013-03-27 8:46 ` [PATCH 1/6] gpio: adp5520: " Linus Walleij
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='006501ce215d$a275fe40$e761fac0$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=grant.likely@secretlab.ca \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).