From: Sebastian Reichel <sre@debian.org>
To: Sebastian Reichel <sre@ring0.de>,
Marek Belisko <marek@goldelico.com>,
Jonathan Cameron <jic23@kernel.org>
Cc: Lee Jones <lee.jones@linaro.org>,
Samuel Ortiz <sameo@linux.intel.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Grant Likely <grant.likely@linaro.org>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-iio@vger.kernel.org, Sebastian Reichel <sre@debian.org>
Subject: [RFCv4 1/7] mfd: twl4030-madc: Use managed resources
Date: Wed, 26 Feb 2014 21:03:04 +0100 [thread overview]
Message-ID: <1393444990-28140-2-git-send-email-sre@debian.org> (raw)
In-Reply-To: <1393444990-28140-1-git-send-email-sre@debian.org>
Update twl4030-madc driver to use managed resources.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/twl4030-madc.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index 4c583e4..5458561 100644
--- a/drivers/mfd/twl4030-madc.c
+++ b/drivers/mfd/twl4030-madc.c
@@ -702,14 +702,14 @@ static int twl4030_madc_probe(struct platform_device *pdev)
{
struct twl4030_madc_data *madc;
struct twl4030_madc_platform_data *pdata = dev_get_platdata(&pdev->dev);
- int ret;
+ int irq, ret;
u8 regval;
if (!pdata) {
dev_err(&pdev->dev, "platform_data not available\n");
return -EINVAL;
}
- madc = kzalloc(sizeof(*madc), GFP_KERNEL);
+ madc = devm_kzalloc(&pdev->dev, sizeof(*madc), GFP_KERNEL);
if (!madc)
return -ENOMEM;
@@ -726,7 +726,7 @@ static int twl4030_madc_probe(struct platform_device *pdev)
TWL4030_MADC_ISR1 : TWL4030_MADC_ISR2;
ret = twl4030_madc_set_power(madc, 1);
if (ret < 0)
- goto err_power;
+ return ret;
ret = twl4030_madc_set_current_generator(madc, 0, 1);
if (ret < 0)
goto err_current_generator;
@@ -770,7 +770,9 @@ static int twl4030_madc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, madc);
mutex_init(&madc->lock);
- ret = request_threaded_irq(platform_get_irq(pdev, 0), NULL,
+
+ irq = platform_get_irq(pdev, 0);
+ ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
twl4030_madc_threaded_irq_handler,
IRQF_TRIGGER_RISING, "twl4030_madc", madc);
if (ret) {
@@ -783,9 +785,6 @@ err_i2c:
twl4030_madc_set_current_generator(madc, 0, 0);
err_current_generator:
twl4030_madc_set_power(madc, 0);
-err_power:
- kfree(madc);
-
return ret;
}
@@ -793,10 +792,8 @@ static int twl4030_madc_remove(struct platform_device *pdev)
{
struct twl4030_madc_data *madc = platform_get_drvdata(pdev);
- free_irq(platform_get_irq(pdev, 0), madc);
twl4030_madc_set_current_generator(madc, 0, 0);
twl4030_madc_set_power(madc, 0);
- kfree(madc);
return 0;
}
--
1.8.5.3
next prev parent reply other threads:[~2014-02-26 20:03 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 13:17 [PATCH 1/2] mfd: twl4030-madc: Add devicetree support Marek Belisko
2014-02-14 13:17 ` [PATCH 2/2] ARM: dts: twl4030: Add twl4030-madc node Marek Belisko
2014-02-14 13:48 ` [PATCH 1/2] mfd: twl4030-madc: Add devicetree support Lee Jones
2014-02-14 14:53 ` Belisko Marek
2014-02-14 15:28 ` Lee Jones
2014-02-14 17:40 ` Sebastian Reichel
2014-02-14 18:46 ` [RFCv1 1/4] mfd: twl4030-madc: Use managed resources Sebastian Reichel
2014-02-14 18:46 ` [RFCv1 2/4] mfd: twl4030-madc: Add DT support and convert to IIO framework Sebastian Reichel
2014-02-15 13:31 ` Belisko Marek
2014-02-16 9:02 ` Sebastian Reichel
2014-02-14 18:46 ` [RFCv1 3/4] Documentation: DT: Document twl4030-madc binding Sebastian Reichel
2014-02-14 18:46 ` [RFCv1 4/4] mfd: twl4030-madc: Move driver to drivers/iio/adc Sebastian Reichel
2014-02-22 12:47 ` Jonathan Cameron
2014-02-23 0:35 ` Sebastian Reichel
2014-02-23 11:02 ` Jonathan Cameron
2014-02-23 22:01 ` Sebastian Reichel
2014-02-23 22:07 ` [RFCv2 0/5] Convert twl4030-madc to IIO API Sebastian Reichel
2014-02-23 22:07 ` [RFCv2 1/5] mfd: twl4030-madc: Use managed resources Sebastian Reichel
2014-02-23 22:07 ` [RFCv2 2/5] mfd: twl4030-madc: Add DT support and convert to IIO framework Sebastian Reichel
2014-02-23 22:07 ` [RFCv2 3/5] mfd: twl4030-madc: Cleanup driver Sebastian Reichel
2014-02-23 22:07 ` [RFCv2 4/5] Documentation: DT: Document twl4030-madc binding Sebastian Reichel
2014-02-23 22:07 ` [RFCv2 5/5] mfd: twl4030-madc: Move driver to drivers/iio/adc Sebastian Reichel
2014-02-23 22:15 ` Joe Perches
2014-02-24 9:20 ` Peter Meerwald
2014-02-26 0:24 ` [RFCv3 0/7] Convert twl4030-madc to IIO API and add DT support Sebastian Reichel
2014-02-26 0:24 ` [RFCv3 1/7] mfd: twl4030-madc: Use managed resources Sebastian Reichel
2014-02-26 0:24 ` [RFCv3 2/7] mfd: twl4030-madc: Add DT support and convert to IIO framework Sebastian Reichel
2014-02-26 9:26 ` Lee Jones
2014-02-26 0:24 ` [RFCv3 3/7] mfd: twl4030-madc: Cleanup driver Sebastian Reichel
2014-02-26 8:29 ` Lee Jones
2014-02-26 0:24 ` [RFCv3 4/7] mfd: twl-core: Add twl_i2c_read/write_u16 Sebastian Reichel
2014-02-26 8:15 ` Lee Jones
2014-02-26 0:24 ` [RFCv3 5/7] mfd: twl4030-madc: Use twl_i2c_read/write_u16 for 16 bit registers Sebastian Reichel
2014-02-26 8:02 ` Lee Jones
2014-02-26 0:24 ` [RFCv3 6/7] Documentation: DT: Document twl4030-madc binding Sebastian Reichel
2014-02-26 0:24 ` [RFCv3 7/7] mfd: twl4030-madc: Move driver to drivers/iio/adc Sebastian Reichel
2014-02-26 11:42 ` [RFCv3 0/7] Convert twl4030-madc to IIO API and add DT support Belisko Marek
2014-02-26 20:03 ` [RFCv4 " Sebastian Reichel
2014-02-26 20:03 ` Sebastian Reichel [this message]
2014-02-26 20:03 ` [RFCv4 2/7] mfd: twl4030-madc: Add DT support and convert to IIO framework Sebastian Reichel
2014-02-27 8:23 ` Lee Jones
2014-03-01 11:33 ` Jonathan Cameron
2014-02-26 20:03 ` [RFCv4 3/7] mfd: twl4030-madc: Cleanup driver Sebastian Reichel
2014-02-27 8:03 ` Lee Jones
2014-03-01 11:41 ` Jonathan Cameron
2014-02-26 20:03 ` [RFCv4 4/7] mfd: twl-core: Add twl_i2c_read/write_u16 Sebastian Reichel
2014-03-01 11:48 ` Jonathan Cameron
2014-02-26 20:03 ` [RFCv4 5/7] mfd: twl4030-madc: Use twl_i2c_read/write_u16 for 16 bit registers Sebastian Reichel
2014-03-01 11:49 ` Jonathan Cameron
2014-02-26 20:03 ` [RFCv4 6/7] Documentation: DT: Document twl4030-madc binding Sebastian Reichel
2014-03-01 11:50 ` Jonathan Cameron
2014-02-26 20:03 ` [RFCv4 7/7] mfd: twl4030-madc: Move driver to drivers/iio/adc Sebastian Reichel
2014-03-01 11:51 ` Jonathan Cameron
2014-03-01 11:52 ` [RFCv4 0/7] Convert twl4030-madc to IIO API and add DT support Jonathan Cameron
2014-03-01 17:12 ` Sebastian Reichel
2014-03-03 8:00 ` Lee Jones
2014-03-01 19:32 ` [PATCHv1 0/9] " Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 1/9] mfd: twl4030-madc: Use managed resources Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 2/9] mfd: twl4030-madc: Add DT support and convert to IIO framework Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 3/9] mfd: twl4030-madc: Cleanup driver Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 4/9] mfd: twl-core: Add twl_i2c_read/write_u16 Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 5/9] mfd: twl4030-madc: Use twl_i2c_read/write_u16 for 16 bit registers Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 6/9] Documentation: DT: Document twl4030-madc binding Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 7/9] mfd: twl4030-madc: Move driver to drivers/iio/adc Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 8/9] iio: documentation: Add ABI documentation for *_mean_raw Sebastian Reichel
2014-03-01 19:32 ` [PATCHv1 9/9] iio: inkern: add iio_read_channel_average_raw Sebastian Reichel
2014-03-04 22:05 ` [PATCHv2 0/9] Convert twl4030-madc to IIO API and add DT support Sebastian Reichel
2014-03-04 22:05 ` [PATCHv2 1/9] mfd: twl4030-madc: Use managed resources Sebastian Reichel
2014-03-15 15:19 ` Jonathan Cameron
2014-04-20 15:51 ` Pavel Machek
2014-03-04 22:05 ` [PATCHv2 2/9] mfd: twl4030-madc: Add DT support and convert to IIO framework Sebastian Reichel
2014-03-05 1:40 ` Lee Jones
2014-03-15 15:23 ` Jonathan Cameron
2014-04-20 15:52 ` Pavel Machek
2014-03-04 22:05 ` [PATCHv2 3/9] mfd: twl4030-madc: Cleanup driver Sebastian Reichel
2014-03-15 15:25 ` Jonathan Cameron
2014-04-20 15:54 ` Pavel Machek
2014-03-04 22:05 ` [PATCHv2 4/9] mfd: twl-core: Add twl_i2c_read/write_u16 Sebastian Reichel
2014-03-04 22:05 ` [PATCHv2 5/9] mfd: twl4030-madc: Use twl_i2c_read/write_u16 for 16 bit registers Sebastian Reichel
2014-03-04 22:05 ` [PATCHv2 6/9] Documentation: DT: Document twl4030-madc binding Sebastian Reichel
2014-03-15 15:27 ` Jonathan Cameron
2014-03-04 22:05 ` [PATCHv2 7/9] mfd: twl4030-madc: Move driver to drivers/iio/adc Sebastian Reichel
2014-03-04 22:05 ` [PATCHv2 8/9] iio: documentation: Add ABI documentation for *_mean_raw Sebastian Reichel
2014-03-15 15:28 ` Jonathan Cameron
2014-03-04 22:05 ` [PATCHv2 9/9] iio: inkern: add iio_read_channel_average_raw Sebastian Reichel
2014-03-15 15:30 ` Jonathan Cameron
2014-03-05 21:00 ` [PATCHv2 0/9] Convert twl4030-madc to IIO API and add DT support Belisko Marek
2014-03-10 10:43 ` Lee Jones
2014-03-10 11:15 ` Sebastian Reichel
2014-02-24 16:05 ` [RFCv1 4/4] mfd: twl4030-madc: Move driver to drivers/iio/adc Lee Jones
2014-02-24 16:04 ` [RFCv1 1/4] mfd: twl4030-madc: Use managed resources Lee Jones
2014-02-15 13:37 ` [PATCH 1/2] mfd: twl4030-madc: Add devicetree support Belisko Marek
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=1393444990-28140-2-git-send-email-sre@debian.org \
--to=sre@debian.org \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marek@goldelico.com \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=sameo@linux.intel.com \
--cc=sre@ring0.de \
/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).