From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>
Cc: Tero Kristo <t-kristo@ti.com>,
alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org,
Benoit Cousson <b-cousson@ti.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc
Date: Tue, 14 Aug 2012 17:22:30 +0300 [thread overview]
Message-ID: <1344954162-7985-3-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1344954162-7985-1-git-send-email-peter.ujfalusi@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/mfd/twl4030-audio.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index ac04b4f..efa2d42 100644
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -188,7 +188,8 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, TWL4030_REG_APLL_CTL);
- audio = kzalloc(sizeof(struct twl4030_audio), GFP_KERNEL);
+ audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio),
+ GFP_KERNEL);
if (!audio)
return -ENOMEM;
@@ -229,22 +230,18 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
ret = -ENODEV;
}
- if (!ret)
- return 0;
+ if (ret) {
+ platform_set_drvdata(pdev, NULL);
+ twl4030_audio_dev = NULL;
+ }
- platform_set_drvdata(pdev, NULL);
- kfree(audio);
- twl4030_audio_dev = NULL;
return ret;
}
static int __devexit twl4030_audio_remove(struct platform_device *pdev)
{
- struct twl4030_audio *audio = platform_get_drvdata(pdev);
-
mfd_remove_devices(&pdev->dev);
platform_set_drvdata(pdev, NULL);
- kfree(audio);
twl4030_audio_dev = NULL;
return 0;
--
1.7.8.6
WARNING: multiple messages have this Message-ID (diff)
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>
Cc: alsa-devel@alsa-project.org, Benoit Cousson <b-cousson@ti.com>,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org, Tero Kristo <t-kristo@ti.com>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc
Date: Tue, 14 Aug 2012 17:22:30 +0300 [thread overview]
Message-ID: <1344954162-7985-3-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1344954162-7985-1-git-send-email-peter.ujfalusi@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/mfd/twl4030-audio.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index ac04b4f..efa2d42 100644
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -188,7 +188,8 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, TWL4030_REG_APLL_CTL);
- audio = kzalloc(sizeof(struct twl4030_audio), GFP_KERNEL);
+ audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio),
+ GFP_KERNEL);
if (!audio)
return -ENOMEM;
@@ -229,22 +230,18 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
ret = -ENODEV;
}
- if (!ret)
- return 0;
+ if (ret) {
+ platform_set_drvdata(pdev, NULL);
+ twl4030_audio_dev = NULL;
+ }
- platform_set_drvdata(pdev, NULL);
- kfree(audio);
- twl4030_audio_dev = NULL;
return ret;
}
static int __devexit twl4030_audio_remove(struct platform_device *pdev)
{
- struct twl4030_audio *audio = platform_get_drvdata(pdev);
-
mfd_remove_devices(&pdev->dev);
platform_set_drvdata(pdev, NULL);
- kfree(audio);
twl4030_audio_dev = NULL;
return 0;
--
1.7.8.6
WARNING: multiple messages have this Message-ID (diff)
From: peter.ujfalusi@ti.com (Peter Ujfalusi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc
Date: Tue, 14 Aug 2012 17:22:30 +0300 [thread overview]
Message-ID: <1344954162-7985-3-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1344954162-7985-1-git-send-email-peter.ujfalusi@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/mfd/twl4030-audio.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index ac04b4f..efa2d42 100644
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -188,7 +188,8 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, TWL4030_REG_APLL_CTL);
- audio = kzalloc(sizeof(struct twl4030_audio), GFP_KERNEL);
+ audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio),
+ GFP_KERNEL);
if (!audio)
return -ENOMEM;
@@ -229,22 +230,18 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
ret = -ENODEV;
}
- if (!ret)
- return 0;
+ if (ret) {
+ platform_set_drvdata(pdev, NULL);
+ twl4030_audio_dev = NULL;
+ }
- platform_set_drvdata(pdev, NULL);
- kfree(audio);
- twl4030_audio_dev = NULL;
return ret;
}
static int __devexit twl4030_audio_remove(struct platform_device *pdev)
{
- struct twl4030_audio *audio = platform_get_drvdata(pdev);
-
mfd_remove_devices(&pdev->dev);
platform_set_drvdata(pdev, NULL);
- kfree(audio);
twl4030_audio_dev = NULL;
return 0;
--
1.7.8.6
next prev parent reply other threads:[~2012-08-14 14:22 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-14 14:22 [PATCH v2 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 01/14] MFD: twl4030-audio: Clean up MODULE_* and platform_driver part Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi [this message]
2012-08-14 14:22 ` [PATCH v2 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-28 9:50 ` Tero Kristo
2012-08-28 9:50 ` Tero Kristo
2012-08-28 9:50 ` Tero Kristo
2012-08-28 16:48 ` Mark Brown
2012-08-28 16:48 ` Mark Brown
2012-08-28 16:48 ` Mark Brown
2012-08-30 9:19 ` Peter Ujfalusi
2012-08-30 9:19 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 03/14] MFD: twl4030-audio: Rearange and clean-up the probe function Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 04/14] MFD: twl-core: Add API to query the HFCLK rate Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 05/14] MFD: twl4030-audio: Get audio MCLK via twl-core API instead of pdata Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 06/14] dt: Add empty of_find_node_by_name() function Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 07/14] MFD: twl4030-audio: Add DT support Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 08/14] Input: twl4030-vibra: Support for DT booted kernel Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 09/14] ASoC: twl4030: Move hs_extmute GPIO handling to driver Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 10/14] ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 11/14] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 12/14] ASoC: twl4030: Convert to use devm_kzalloc Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 13/14] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-14 14:22 ` [PATCH v2 14/14] ASoC: twl4030: Support for DT booted kernel Peter Ujfalusi
2012-08-14 14:22 ` Peter Ujfalusi
2012-08-28 9:51 ` [PATCH v2 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Tero Kristo
2012-08-28 9:51 ` Tero Kristo
2012-08-28 9:51 ` Tero Kristo
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=1344954162-7985-3-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=rob.herring@calxeda.com \
--cc=t-kristo@ti.com \
--cc=tony@atomide.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.