Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99b59f3c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Remove -codec from WM8731 driver name 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 5e251aec

sound/soc/atmel/sam9g20_wm8731.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { 
	.codec_dai_name = "wm8731-hifi",

	.init = at91sam9g20ek_wm8731_init,

	.platform_name = "atmel-pcm-audio",

	.codec_name = "wm8731-codec.0-001b",

	.codec_name = "wm8731.0-001b",

	.ops = &at91sam9g20ek_ops,

};

sound/soc/au1x/db1200.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct snd_soc_dai_link db1200_i2s_dai = { 
	.codec_dai_name	= "wm8731-hifi",

	.cpu_dai_name	= "au1xpsc_i2s.1",

	.platform_name	= "au1xpsc-pcm.1",

	.codec_name	= "wm8731-codec.0-001b",

	.codec_name	= "wm8731.0-001b",

	.ops		= &db1200_i2s_wm8731_ops,

};

sound/soc/codecs/wm8731.c

+2 −2
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi) 


static struct spi_driver wm8731_spi_driver = {

	.driver = {

		.name	= "wm8731-codec",

		.name	= "wm8731",

		.owner	= THIS_MODULE,

	},

	.probe		= wm8731_spi_probe,
@@ -703,7 +703,7 @@ MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id); 


static struct i2c_driver wm8731_i2c_driver = {

	.driver = {

		.name = "wm8731-codec",

		.name = "wm8731",

		.owner = THIS_MODULE,

	},

	.probe =    wm8731_i2c_probe,

sound/soc/pxa/corgi.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static struct snd_soc_dai_link corgi_dai = { 
	.cpu_dai_name = "pxa2xx-i2s",

	.codec_dai_name = "wm8731-hifi",

	.platform_name = "pxa-pcm-audio",

	.codec_name = "wm8731-codec.0-001b",

	.codec_name = "wm8731.0-001b",

	.init = corgi_wm8731_init,

	.ops = &corgi_ops,

};

sound/soc/pxa/poodle.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = { 
	.cpu_dai_name = "pxa2xx-i2s",

	.codec_dai_name = "wm8731-hifi",

	.platform_name = "pxa-pcm-audio",

	.codec_name = "wm8731-codec.0-001b",

	.codec_name = "wm8731.0-001b",

	.init = poodle_wm8731_init,

	.ops = &poodle_ops,

};