From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 19 Sep 2010 15:07:06 +0000 (+0100)
Subject: ASoC: Fix WM8978/migor driver name conflict
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1226^2~411
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5250a5031ee5733c10c7cb371206ed3784918adc;p=firefly-linux-kernel-4.4.55.git

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 676a4306cc87..13b979a71a7c 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 f4620176a3ff..ac6c49ce6fdf 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,
 };