* [PATCH 2/4] ASoC: pcm3008: Move gpio allocation to probe
2013-07-10 15:54 [PATCH 1/4] ASoC: pcm3008: Remove noisy version print Mark Brown
@ 2013-07-10 15:54 ` Mark Brown
2013-07-10 15:54 ` [PATCH 3/4] ASoC: pcm3008: Check for platform data Mark Brown
2013-07-10 15:55 ` [PATCH 4/4] ASoC: pcm3008: Convert to devm_gpio_request_one() Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2013-07-10 15:54 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
This is better from a device model point of view since we don't try to
do things like instantiate the card until the required resources appear.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/pcm3008.c | 87 ++++++++++++++++++++--------------------------
1 file changed, 38 insertions(+), 49 deletions(-)
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index 32e5a59..8ab1c03 100644
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -57,10 +57,40 @@ static void pcm3008_gpio_free(struct pcm3008_setup_data *setup)
gpio_free(setup->pdda_pin);
}
-static int pcm3008_soc_probe(struct snd_soc_codec *codec)
+#ifdef CONFIG_PM
+static int pcm3008_soc_suspend(struct snd_soc_codec *codec)
+{
+ struct pcm3008_setup_data *setup = codec->dev->platform_data;
+
+ gpio_set_value(setup->pdad_pin, 0);
+ gpio_set_value(setup->pdda_pin, 0);
+
+ return 0;
+}
+
+static int pcm3008_soc_resume(struct snd_soc_codec *codec)
{
struct pcm3008_setup_data *setup = codec->dev->platform_data;
- int ret = 0;
+
+ gpio_set_value(setup->pdad_pin, 1);
+ gpio_set_value(setup->pdda_pin, 1);
+
+ return 0;
+}
+#else
+#define pcm3008_soc_suspend NULL
+#define pcm3008_soc_resume NULL
+#endif
+
+static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = {
+ .suspend = pcm3008_soc_suspend,
+ .resume = pcm3008_soc_resume,
+};
+
+static int pcm3008_codec_probe(struct platform_device *pdev)
+{
+ struct pcm3008_setup_data *setup = pdev->dev.platform_data;
+ int ret;
/* DEM1 DEM0 DE-EMPHASIS_MODE
* Low Low De-emphasis 44.1 kHz ON
@@ -97,63 +127,22 @@ static int pcm3008_soc_probe(struct snd_soc_codec *codec)
if (ret != 0)
goto gpio_err;
- return ret;
+ return snd_soc_register_codec(&pdev->dev,
+ &soc_codec_dev_pcm3008, &pcm3008_dai, 1);
gpio_err:
pcm3008_gpio_free(setup);
-
return ret;
}
-static int pcm3008_soc_remove(struct snd_soc_codec *codec)
-{
- struct pcm3008_setup_data *setup = codec->dev->platform_data;
-
- pcm3008_gpio_free(setup);
- return 0;
-}
-
-#ifdef CONFIG_PM
-static int pcm3008_soc_suspend(struct snd_soc_codec *codec)
-{
- struct pcm3008_setup_data *setup = codec->dev->platform_data;
-
- gpio_set_value(setup->pdad_pin, 0);
- gpio_set_value(setup->pdda_pin, 0);
-
- return 0;
-}
-
-static int pcm3008_soc_resume(struct snd_soc_codec *codec)
+static int pcm3008_codec_remove(struct platform_device *pdev)
{
- struct pcm3008_setup_data *setup = codec->dev->platform_data;
+ struct pcm3008_setup_data *setup = pdev->dev.platform_data;
- gpio_set_value(setup->pdad_pin, 1);
- gpio_set_value(setup->pdda_pin, 1);
-
- return 0;
-}
-#else
-#define pcm3008_soc_suspend NULL
-#define pcm3008_soc_resume NULL
-#endif
-
-static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = {
- .probe = pcm3008_soc_probe,
- .remove = pcm3008_soc_remove,
- .suspend = pcm3008_soc_suspend,
- .resume = pcm3008_soc_resume,
-};
+ snd_soc_unregister_codec(&pdev->dev);
-static int pcm3008_codec_probe(struct platform_device *pdev)
-{
- return snd_soc_register_codec(&pdev->dev,
- &soc_codec_dev_pcm3008, &pcm3008_dai, 1);
-}
+ pcm3008_gpio_free(setup);
-static int pcm3008_codec_remove(struct platform_device *pdev)
-{
- snd_soc_unregister_codec(&pdev->dev);
return 0;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/4] ASoC: pcm3008: Check for platform data
2013-07-10 15:54 [PATCH 1/4] ASoC: pcm3008: Remove noisy version print Mark Brown
2013-07-10 15:54 ` [PATCH 2/4] ASoC: pcm3008: Move gpio allocation to probe Mark Brown
@ 2013-07-10 15:54 ` Mark Brown
2013-07-10 15:55 ` [PATCH 4/4] ASoC: pcm3008: Convert to devm_gpio_request_one() Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2013-07-10 15:54 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
The driver will crash if none is provided.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/pcm3008.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index 8ab1c03..4fa4ded 100644
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -92,6 +92,9 @@ static int pcm3008_codec_probe(struct platform_device *pdev)
struct pcm3008_setup_data *setup = pdev->dev.platform_data;
int ret;
+ if (!setup)
+ return -EINVAL;
+
/* DEM1 DEM0 DE-EMPHASIS_MODE
* Low Low De-emphasis 44.1 kHz ON
* Low High De-emphasis OFF
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] ASoC: pcm3008: Convert to devm_gpio_request_one()
2013-07-10 15:54 [PATCH 1/4] ASoC: pcm3008: Remove noisy version print Mark Brown
2013-07-10 15:54 ` [PATCH 2/4] ASoC: pcm3008: Move gpio allocation to probe Mark Brown
2013-07-10 15:54 ` [PATCH 3/4] ASoC: pcm3008: Check for platform data Mark Brown
@ 2013-07-10 15:55 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2013-07-10 15:55 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/codecs/pcm3008.c | 44 ++++++++++++--------------------------------
1 file changed, 12 insertions(+), 32 deletions(-)
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index 4fa4ded..b883f99 100644
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -49,14 +49,6 @@ static struct snd_soc_dai_driver pcm3008_dai = {
},
};
-static void pcm3008_gpio_free(struct pcm3008_setup_data *setup)
-{
- gpio_free(setup->dem0_pin);
- gpio_free(setup->dem1_pin);
- gpio_free(setup->pdad_pin);
- gpio_free(setup->pdda_pin);
-}
-
#ifdef CONFIG_PM
static int pcm3008_soc_suspend(struct snd_soc_codec *codec)
{
@@ -103,49 +95,37 @@ static int pcm3008_codec_probe(struct platform_device *pdev)
*/
/* Configure DEM0 GPIO (turning OFF DAC De-emphasis). */
- ret = gpio_request(setup->dem0_pin, "codec_dem0");
- if (ret == 0)
- ret = gpio_direction_output(setup->dem0_pin, 1);
+ ret = devm_gpio_request_one(&pdev->dev, setup->dem0_pin,
+ GPIOF_OUT_INIT_HIGH, "codec_dem0");
if (ret != 0)
- goto gpio_err;
+ return ret;
/* Configure DEM1 GPIO (turning OFF DAC De-emphasis). */
- ret = gpio_request(setup->dem1_pin, "codec_dem1");
- if (ret == 0)
- ret = gpio_direction_output(setup->dem1_pin, 0);
+ ret = devm_gpio_request_one(&pdev->dev, setup->dem1_pin,
+ GPIOF_OUT_INIT_LOW, "codec_dem1");
if (ret != 0)
- goto gpio_err;
+ return ret;
/* Configure PDAD GPIO. */
- ret = gpio_request(setup->pdad_pin, "codec_pdad");
- if (ret == 0)
- ret = gpio_direction_output(setup->pdad_pin, 1);
+ ret = devm_gpio_request_one(&pdev->dev, setup->pdad_pin,
+ GPIOF_OUT_INIT_HIGH, "codec_pdad");
if (ret != 0)
- goto gpio_err;
+ return ret;
/* Configure PDDA GPIO. */
- ret = gpio_request(setup->pdda_pin, "codec_pdda");
- if (ret == 0)
- ret = gpio_direction_output(setup->pdda_pin, 1);
+ ret = devm_gpio_request_one(&pdev->dev, setup->pdda_pin,
+ GPIOF_OUT_INIT_HIGH, "codec_pdda");
if (ret != 0)
- goto gpio_err;
+ return ret;
return snd_soc_register_codec(&pdev->dev,
&soc_codec_dev_pcm3008, &pcm3008_dai, 1);
-
-gpio_err:
- pcm3008_gpio_free(setup);
- return ret;
}
static int pcm3008_codec_remove(struct platform_device *pdev)
{
- struct pcm3008_setup_data *setup = pdev->dev.platform_data;
-
snd_soc_unregister_codec(&pdev->dev);
- pcm3008_gpio_free(setup);
-
return 0;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread