Re: [PATCH 1/5] ASoC: ep93xx: get rid of ep93xx-pcm-audio struct device

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1.1: Type: text/plain, Size: 7811 bytes --]

On Mon, Dec 09, 2013 at 01:24:12PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Modify the ep93xx PCM driver so that it's a utility library that can be
> registered on each DAI, rather than a separate struct device. This is
> more in line with how many recent DT-converted platforms operate, and
> avoids the need for yet another struct device.

Please CC driver maintainers, adding Hartley and Ryan.

> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
>  sound/soc/cirrus/edb93xx.c     |  2 +-
>  sound/soc/cirrus/ep93xx-ac97.c |  9 +++++++++
>  sound/soc/cirrus/ep93xx-i2s.c  |  9 +++++++++
>  sound/soc/cirrus/ep93xx-pcm.c  | 26 ++++++++------------------
>  sound/soc/cirrus/ep93xx-pcm.h  | 24 ++++++++++++++++++++++++
>  sound/soc/cirrus/simone.c      |  2 +-
>  sound/soc/cirrus/snappercl15.c |  2 +-
>  7 files changed, 53 insertions(+), 21 deletions(-)
>  create mode 100644 sound/soc/cirrus/ep93xx-pcm.h
> 
> diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c
> index c43fb214558a..4f900efc437c 100644
> --- a/sound/soc/cirrus/edb93xx.c
> +++ b/sound/soc/cirrus/edb93xx.c
> @@ -63,7 +63,7 @@ static struct snd_soc_ops edb93xx_ops = {
>  static struct snd_soc_dai_link edb93xx_dai = {
>  	.name		= "CS4271",
>  	.stream_name	= "CS4271 HiFi",
> -	.platform_name	= "ep93xx-pcm-audio",
> +	.platform_name	= "ep93xx-i2s",
>  	.cpu_dai_name	= "ep93xx-i2s",
>  	.codec_name	= "spi0.0",
>  	.codec_dai_name	= "cs4271-hifi",
> diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
> index efa75b5086a4..e45f0fd2f6b8 100644
> --- a/sound/soc/cirrus/ep93xx-ac97.c
> +++ b/sound/soc/cirrus/ep93xx-ac97.c
> @@ -24,6 +24,8 @@
>  
>  #include <linux/platform_data/dma-ep93xx.h>
>  
> +#include "ep93xx-pcm.h"
> +
>  /*
>   * Per channel (1-4) registers.
>   */
> @@ -394,8 +396,14 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto fail;
>  
> +	err = ep93xx_pcm_platform_register(&pdev->dev);
> +	if (err)
> +		goto fail_unregister;
> +
>  	return 0;
>  
> +fail_unregister:
> +	snd_soc_unregister_component(&pdev->dev);
>  fail:
>  	ep93xx_ac97_info = NULL;
>  	snd_soc_set_ac97_ops(NULL);
> @@ -406,6 +414,7 @@ static int ep93xx_ac97_remove(struct platform_device *pdev)
>  {
>  	struct ep93xx_ac97_info	*info = platform_get_drvdata(pdev);
>  
> +	ep93xx_pcm_platform_unregister(&pdev->dev);
>  	snd_soc_unregister_component(&pdev->dev);
>  
>  	/* disable the AC97 controller */
> diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
> index a57643d6402f..cc43ed2dbca5 100644
> --- a/sound/soc/cirrus/ep93xx-i2s.c
> +++ b/sound/soc/cirrus/ep93xx-i2s.c
> @@ -30,6 +30,8 @@
>  #include <mach/ep93xx-regs.h>
>  #include <linux/platform_data/dma-ep93xx.h>
>  
> +#include "ep93xx-pcm.h"
> +
>  #define EP93XX_I2S_TXCLKCFG		0x00
>  #define EP93XX_I2S_RXCLKCFG		0x04
>  #define EP93XX_I2S_GLCTRL		0x0C
> @@ -405,8 +407,14 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
>  	if (err)
>  		goto fail_put_lrclk;
>  
> +	err = ep93xx_pcm_platform_register(&pdev->dev);
> +	if (err)
> +		goto fail_unregister;
> +
>  	return 0;
>  
> +fail_unregister:
> +	snd_soc_unregister_component(&pdev->dev);
>  fail_put_lrclk:
>  	clk_put(info->lrclk);
>  fail_put_sclk:
> @@ -421,6 +429,7 @@ static int ep93xx_i2s_remove(struct platform_device *pdev)
>  {
>  	struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
>  
> +	ep93xx_pcm_platform_unregister(&pdev->dev);
>  	snd_soc_unregister_component(&pdev->dev);
>  	clk_put(info->lrclk);
>  	clk_put(info->sclk);
> diff --git a/sound/soc/cirrus/ep93xx-pcm.c b/sound/soc/cirrus/ep93xx-pcm.c
> index cfe517e68009..144278aa65f9 100644
> --- a/sound/soc/cirrus/ep93xx-pcm.c
> +++ b/sound/soc/cirrus/ep93xx-pcm.c
> @@ -23,6 +23,8 @@
>  
>  #include <linux/platform_data/dma-ep93xx.h>
>  
> +#include "ep93xx-pcm.h"
> +
>  static const struct snd_pcm_hardware ep93xx_pcm_hardware = {
>  	.info			= (SNDRV_PCM_INFO_MMAP		|
>  				   SNDRV_PCM_INFO_MMAP_VALID	|
> @@ -76,34 +78,22 @@ static const struct snd_dmaengine_pcm_config ep93xx_dmaengine_pcm_config = {
>  	.prealloc_buffer_size = 131072,
>  };
>  
> -static int ep93xx_soc_platform_probe(struct platform_device *pdev)
> +int ep93xx_pcm_platform_register(struct device *dev)
>  {
> -	return snd_dmaengine_pcm_register(&pdev->dev,
> +	return snd_dmaengine_pcm_register(dev,
>  		&ep93xx_dmaengine_pcm_config,
>  		SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |
>  		SND_DMAENGINE_PCM_FLAG_NO_DT |
>  		SND_DMAENGINE_PCM_FLAG_COMPAT);
>  }
> +EXPORT_SYMBOL_GPL(ep93xx_pcm_platform_register);
>  
> -static int ep93xx_soc_platform_remove(struct platform_device *pdev)
> +void ep93xx_pcm_platform_unregister(struct device *dev)
>  {
> -	snd_dmaengine_pcm_unregister(&pdev->dev);
> -	return 0;
> +	snd_dmaengine_pcm_unregister(dev);
>  }
> -
> -static struct platform_driver ep93xx_pcm_driver = {
> -	.driver = {
> -			.name = "ep93xx-pcm-audio",
> -			.owner = THIS_MODULE,
> -	},
> -
> -	.probe = ep93xx_soc_platform_probe,
> -	.remove = ep93xx_soc_platform_remove,
> -};
> -
> -module_platform_driver(ep93xx_pcm_driver);
> +EXPORT_SYMBOL_GPL(ep93xx_pcm_platform_unregister);
>  
>  MODULE_AUTHOR("Ryan Mallon");
>  MODULE_DESCRIPTION("EP93xx ALSA PCM interface");
>  MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:ep93xx-pcm-audio");
> diff --git a/sound/soc/cirrus/ep93xx-pcm.h b/sound/soc/cirrus/ep93xx-pcm.h
> new file mode 100644
> index 000000000000..5ee1afce931f
> --- /dev/null
> +++ b/sound/soc/cirrus/ep93xx-pcm.h
> @@ -0,0 +1,24 @@
> +/*
> + * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#ifndef __EP93XX_PCM_H__
> +#define __EP93XX_PCM_H__
> +
> +int ep93xx_pcm_platform_register(struct device *dev);
> +void ep93xx_pcm_platform_unregister(struct device *dev);
> +
> +#endif
> +
> diff --git a/sound/soc/cirrus/simone.c b/sound/soc/cirrus/simone.c
> index 4d094d00c34a..822a19a89e74 100644
> --- a/sound/soc/cirrus/simone.c
> +++ b/sound/soc/cirrus/simone.c
> @@ -27,7 +27,7 @@ static struct snd_soc_dai_link simone_dai = {
>  	.cpu_dai_name	= "ep93xx-ac97",
>  	.codec_dai_name	= "ac97-hifi",
>  	.codec_name	= "ac97-codec",
> -	.platform_name	= "ep93xx-pcm-audio",
> +	.platform_name	= "ep93xx-ac97",
>  };
>  
>  static struct snd_soc_card snd_soc_simone = {
> diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c
> index 69041074f2c1..29238a7476dd 100644
> --- a/sound/soc/cirrus/snappercl15.c
> +++ b/sound/soc/cirrus/snappercl15.c
> @@ -83,7 +83,7 @@ static struct snd_soc_dai_link snappercl15_dai = {
>  	.cpu_dai_name	= "ep93xx-i2s",
>  	.codec_dai_name	= "tlv320aic23-hifi",
>  	.codec_name	= "tlv320aic23-codec.0-001a",
> -	.platform_name	=  "ep93xx-pcm-audio",
> +	.platform_name	= "ep93xx-i2s",
>  	.init		= snappercl15_tlv320aic23_init,
>  	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
>  			  SND_SOC_DAIFMT_CBS_CFS,
> -- 
> 1.8.1.5
> 
> 

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]