ASoC: Remove redundant -codec from WM8776 driver name

Signed-off-by: Mark Brown <[email protected]>
Acked-by: Timur Tabi <[email protected]>

diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index 8e7953b1b790161a8a394b0b10a7b7d8a160487a..367a990e6cc4a049d271b7c0e6261ab40e16b639 100644 (file)
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -481,7 +481,7 @@ static int __devexit wm8776_spi_remove(struct spi_device *spi)
 
 static struct spi_driver wm8776_spi_driver = {
        .driver = {
-               .name   = "wm8776-codec",
+               .name   = "wm8776",
                .owner  = THIS_MODULE,
        },
        .probe          = wm8776_spi_probe,
@@ -525,7 +525,7 @@ MODULE_DEVICE_TABLE(i2c, wm8776_i2c_id);
 
 static struct i2c_driver wm8776_i2c_driver = {
        .driver = {
-               .name = "wm8776-codec",
+               .name = "wm8776",
                .owner = THIS_MODULE,
        },
        .probe =    wm8776_i2c_probe,

diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index fcb862eb0c73420e1c3ecb65c240e8ed2a2569f2..e8849ed36cbd10a010bbae3191bc2d0a6d6cc2f8 100644 (file)
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -267,7 +267,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len)
        if (bus < 0)
                return bus;
 
-       snprintf(buf, len, "%s-codec.%u-%04x", temp, bus, addr);
+       snprintf(buf, len, "%s.%u-%04x", temp, bus, addr);
 
        return 0;
 }