[alsa-devel] [PATCH] ASoC: Fix WM8978/migor driver name conflict

[Liam Girdwood]

On Sun, 2010-09-19 at 20:54 +0100, Mark Brown wrote:
> Standardise on 'wm8978' as the name for the CODEC.
> 
> Reported-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  sound/soc/codecs/wm8978.c |    2 +-
>  sound/soc/sh/migor.c      |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
> index 676a430..13b979a 100644
> --- a/sound/soc/codecs/wm8978.c
> +++ b/sound/soc/codecs/wm8978.c
> @@ -1038,7 +1038,7 @@ MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id);
>  
>  static struct i2c_driver wm8978_i2c_driver = {
>  	.driver = {
> -		.name = "WM8978-codec",
> +		.name = "wm8978",
>  		.owner = THIS_MODULE,
>  	},
>  	.probe =    wm8978_i2c_probe,
> diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c
> index f462017..ac6c49c 100644
> --- a/sound/soc/sh/migor.c
> +++ b/sound/soc/sh/migor.c
> @@ -156,7 +156,7 @@ static struct snd_soc_dai_link migor_dai = {
>  	.cpu_dai_name = "siu-i2s-dai",
>  	.codec_dai_name = "wm8978-hifi",
>  	.platform_name = "siu-pcm-audio",
> -	.codec_name = "wm8978-codec.0-001a",
> +	.codec_name = "wm8978.0-001a",
>  	.ops = &migor_dai_ops,
>  	.init = migor_dai_init,
>  };

Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk