From: Jingoo Han <jg1.han@samsung.com>
To: "'Samuel Ortiz'" <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, "'Jingoo Han'" <jg1.han@samsung.com>
Subject: [PATCH 04/11] mfd: intel_msic: use devm_gpio_request_one()
Date: Wed, 20 Feb 2013 15:11:14 +0900 [thread overview]
Message-ID: <002901ce0f31$16413770$42c3a650$%han@samsung.com> (raw)
In-Reply-To: <002601ce0f30$d6b81c40$842854c0$%han@samsung.com>
Use devm_gpio_request_one() to make cleanup paths more simple.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/mfd/intel_msic.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c
index 1804331..5be3b5e 100644
--- a/drivers/mfd/intel_msic.c
+++ b/drivers/mfd/intel_msic.c
@@ -323,7 +323,8 @@ static int intel_msic_init_devices(struct intel_msic *msic)
if (pdata->ocd) {
unsigned gpio = pdata->ocd->gpio;
- ret = gpio_request_one(gpio, GPIOF_IN, "ocd_gpio");
+ ret = devm_gpio_request_one(&pdev->dev, gpio,
+ GPIOF_IN, "ocd_gpio");
if (ret) {
dev_err(&pdev->dev, "failed to register OCD GPIO\n");
return ret;
@@ -332,7 +333,6 @@ static int intel_msic_init_devices(struct intel_msic *msic)
ret = gpio_to_irq(gpio);
if (ret < 0) {
dev_err(&pdev->dev, "no IRQ number for OCD GPIO\n");
- gpio_free(gpio);
return ret;
}
@@ -359,8 +359,6 @@ static int intel_msic_init_devices(struct intel_msic *msic)
fail:
mfd_remove_devices(&pdev->dev);
- if (pdata->ocd)
- gpio_free(pdata->ocd->gpio);
return ret;
}
@@ -368,12 +366,8 @@ fail:
static void intel_msic_remove_devices(struct intel_msic *msic)
{
struct platform_device *pdev = msic->pdev;
- struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
mfd_remove_devices(&pdev->dev);
-
- if (pdata->ocd)
- gpio_free(pdata->ocd->gpio);
}
static int intel_msic_probe(struct platform_device *pdev)
--
1.7.2.5
next prev parent reply other threads:[~2013-02-20 6:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 6:09 [PATCH 01/11] mfd: 88pm860x: drop devm_kfree of devm_kzalloc'd data Jingoo Han
2013-02-20 6:10 ` [PATCH 02/11] mfd: lm3533: use devm_gpio_request_one() Jingoo Han
2013-02-20 6:10 ` [PATCH 03/11] mfd: aat2870: use devm_gpio_request_one() and devm_kzalloc() Jingoo Han
2013-02-20 6:11 ` Jingoo Han [this message]
2013-02-20 6:11 ` [PATCH 05/11] mfd: twl6040: use devm_gpio_request_one() and devm_request_threaded_irq() Jingoo Han
2013-02-20 7:37 ` Dmitry Torokhov
2013-02-20 8:09 ` Jingoo Han
2013-02-20 6:12 ` [PATCH 06/11] mfd: omap-usb-host: use devm_gpio_request_one() Jingoo Han
2013-02-20 6:12 ` [PATCH 07/11] mfd: menelaus: use devm_request_irq() and devm_kzalloc() Jingoo Han
2013-02-20 7:30 ` Dmitry Torokhov
2013-02-20 8:05 ` Jingoo Han
2013-02-20 8:10 ` Dmitry Torokhov
2013-02-20 8:17 ` Jingoo Han
2013-02-20 8:36 ` Dmitry Torokhov
2013-02-20 6:13 ` [PATCH 08/11] mfd: ezx-pcap: " Jingoo Han
2013-02-20 7:33 ` Dmitry Torokhov
2013-02-20 8:06 ` Jingoo Han
2013-02-20 6:13 ` [PATCH 09/11] mfd: da903x: " Jingoo Han
2013-02-20 6:14 ` [PATCH 10/11] mfd: tps65010: " Jingoo Han
2013-02-20 7:35 ` Dmitry Torokhov
2013-02-20 8:07 ` Jingoo Han
2013-02-20 6:14 ` [PATCH 11/11] mfd: tc3589x: " 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='002901ce0f31$16413770$42c3a650$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.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®