From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Jingoo Han <jg1.han@samsung.com>
Cc: "'Samuel Ortiz'" <sameo@linux.intel.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 05/11] mfd: twl6040: use devm_gpio_request_one() and devm_request_threaded_irq()
Date: Tue, 19 Feb 2013 23:37:04 -0800 [thread overview]
Message-ID: <20130220073704.GE2648@core.coreip.homeip.net> (raw)
In-Reply-To: <002a01ce0f31$24e5fef0$6eb1fcd0$%han@samsung.com>
Hi Jingoo,
On Wed, Feb 20, 2013 at 03:11:38PM +0900, Jingoo Han wrote:
> Use devm_gpio_request_one() and devm_request_threaded_irq() to make
> cleanup paths and more simple.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> drivers/mfd/twl6040.c | 26 +++++++-------------------
> 1 files changed, 7 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
> index f361bf3..2d38512 100644
> --- a/drivers/mfd/twl6040.c
> +++ b/drivers/mfd/twl6040.c
> @@ -586,8 +586,8 @@ static int twl6040_probe(struct i2c_client *client,
> twl6040->audpwron = -EINVAL;
>
> if (gpio_is_valid(twl6040->audpwron)) {
> - ret = gpio_request_one(twl6040->audpwron, GPIOF_OUT_INIT_LOW,
> - "audpwron");
> + ret = devm_gpio_request_one(twl6040->dev, twl6040->audpwron,
> + GPIOF_OUT_INIT_LOW, "audpwron");
> if (ret)
> goto gpio_err;
> }
> @@ -596,14 +596,14 @@ static int twl6040_probe(struct i2c_client *client,
> IRQF_ONESHOT, 0, &twl6040_irq_chip,
> &twl6040->irq_data);
> if (ret < 0)
> - goto irq_init_err;
> + goto gpio_err;
>
> twl6040->irq_ready = regmap_irq_get_virq(twl6040->irq_data,
> TWL6040_IRQ_READY);
> twl6040->irq_th = regmap_irq_get_virq(twl6040->irq_data,
> TWL6040_IRQ_TH);
>
> - ret = request_threaded_irq(twl6040->irq_ready, NULL,
> + ret = devm_request_threaded_irq(twl6040->dev, twl6040->irq_ready, NULL,
> twl6040_readyint_handler, IRQF_ONESHOT,
> "twl6040_irq_ready", twl6040);
> if (ret) {
> @@ -611,12 +611,12 @@ static int twl6040_probe(struct i2c_client *client,
> goto readyirq_err;
> }
>
> - ret = request_threaded_irq(twl6040->irq_th, NULL,
> + ret = devm_request_threaded_irq(twl6040->dev, twl6040->irq_th, NULL,
> twl6040_thint_handler, IRQF_ONESHOT,
> "twl6040_irq_th", twl6040);
> if (ret) {
> dev_err(twl6040->dev, "Thermal IRQ request failed: %d\n", ret);
> - goto thirq_err;
> + goto readyirq_err;
> }
>
> /* dual-access registers controlled by I2C only */
> @@ -676,19 +676,12 @@ static int twl6040_probe(struct i2c_client *client,
> ret = mfd_add_devices(&client->dev, -1, twl6040->cells, children,
> NULL, 0, NULL);
> if (ret)
> - goto mfd_err;
> + goto readyirq_err;
>
> return 0;
>
> -mfd_err:
> - free_irq(twl6040->irq_th, twl6040);
> -thirq_err:
> - free_irq(twl6040->irq_ready, twl6040);
> readyirq_err:
> regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
> -irq_init_err:
> - if (gpio_is_valid(twl6040->audpwron))
> - gpio_free(twl6040->audpwron);
> gpio_err:
> regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies);
> power_err:
> @@ -706,11 +699,6 @@ static int twl6040_remove(struct i2c_client *client)
> if (twl6040->power_count)
> twl6040_power(twl6040, 0);
>
> - if (gpio_is_valid(twl6040->audpwron))
> - gpio_free(twl6040->audpwron);
> -
> - free_irq(twl6040->irq_ready, twl6040);
> - free_irq(twl6040->irq_th, twl6040);
> regmap_del_irq_chip(twl6040->irq, twl6040->irq_data);
>
> mfd_remove_devices(&client->dev);
Are you sure it is OK to have sub-devices removed and regmap destroyed
with IRQs still active?
Thanks.
--
Dmitry
next prev parent reply other threads:[~2013-02-20 7:37 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 ` [PATCH 04/11] mfd: intel_msic: use devm_gpio_request_one() Jingoo Han
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 [this message]
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=20130220073704.GE2648@core.coreip.homeip.net \
--to=dmitry.torokhov@gmail.com \
--cc=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®