[alsa-devel] [PATCH 22/54 v2] ASoC: switch over to use snd_soc_register_component() on jz4740 i2s

[Lars-Peter Clausen]

On 03/21/2013 11:32 AM, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Acked-by: Lars-Peter Clausen <lars at metafoo.de>

> ---
>  sound/soc/jz4740/jz4740-i2s.c |    9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
> index 6cef491..9a12644 100644
> --- a/sound/soc/jz4740/jz4740-i2s.c
> +++ b/sound/soc/jz4740/jz4740-i2s.c
> @@ -425,6 +425,10 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
>  	.resume = jz4740_i2s_resume,
>  };
>  
> +static const struct snd_soc_component_driver jz4740_i2s_component = {
> +	.name		= "jz4740-i2s",
> +};
> +
>  static int jz4740_i2s_dev_probe(struct platform_device *pdev)
>  {
>  	struct jz4740_i2s *i2s;
> @@ -469,7 +473,8 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev)
>  	}
>  
>  	platform_set_drvdata(pdev, i2s);
> -	ret = snd_soc_register_dai(&pdev->dev, &jz4740_i2s_dai);
> +	ret = snd_soc_register_component(&pdev->dev, &jz4740_i2s_component,
> +					 &jz4740_i2s_dai, 1);
>  
>  	if (ret) {
>  		dev_err(&pdev->dev, "Failed to register DAI\n");
> @@ -496,7 +501,7 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev)
>  {
>  	struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
>  
> -	snd_soc_unregister_dai(&pdev->dev);
> +	snd_soc_unregister_component(&pdev->dev);
>  
>  	clk_put(i2s->clk_i2s);
>  	clk_put(i2s->clk_aic);