Commit 5250a503 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Fix WM8978/migor driver name conflict 



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

Reported-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent b9fde18c

sound/soc/codecs/wm8978.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/sh/migor.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};