ASoC: Remove -codec from WM8731 driver name

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>

diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index af3c73053ee4f55f58a2e35888761e71396f2e6d..28afbbf69ce00d30c76754eb6f8bb0c5adea519e 100644 (file)
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -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,
 };
 

diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
index cb99f04abe88aaed8d42dc90e264c0137a5276a0..1d3e258c9ea8ec861cf19c88a9bd7c99e5384940 100644 (file)
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@ -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,
 };
 

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 44a591e825585f17b598d12e81b7695daef79515..6dec7cee2cb4bd5fcd0cda18c7b325284a2ae039 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -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,

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 9027da466caeac67a4093d6d371e263553d228ae..28757fb9df31d49ac5c37f63ae668a157338949c 100644 (file)
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -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,
 };

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index a7d4999f9b24f4c9d202b9d21647760be483502a..da3ae4316cf2b9930d46fd2cf47f01c357f4f376 100644 (file)
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -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,
 };