iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: pcm3008: Convert to devm_gpio_request_one()

Browse Source 
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Mark Brown 2013-07-10 16:53:55 +01:00
parent 33319a2fcc
commit d57a79acc7
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sound/soc/codecs/pcm3008.c
View File

@ -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;
}