ASoC: Fix WM8978/migor driver name conflict

Standardise on 'wm8978' as the name for the CODEC.

Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index 676a4306cc87e29bfa978da4f40454fcbeb1419c..13b979a71a7cfc6847a4f8cd72d21f10778c2dc4 100644 (file)
--- 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 f4620176a3ff30508f1aa39c8fe1c8ff02a839fd..ac6c49ce6fdf5eb199ebad36b64c9fc159f10d40 100644 (file)
--- 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,
 };