ASoC: Remove unnecessary -codec from cs4270 driver name

Similar to what commit 1e3ad57 (ASoC: Remove redundant -codec from
WM8776 driver name) does for wm8776 driver, this patch does the same
thing for cs4270 driver.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 6baccd285df1dd3eefd351e4eb39964405d47869..1d672f528662cb162fc99a36b6946026a2dfdb09 100644 (file)
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -715,7 +715,7 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id);
  */
 static struct i2c_driver cs4270_i2c_driver = {
        .driver = {
-               .name = "cs4270-codec",
+               .name = "cs4270",
                .owner = THIS_MODULE,
        },
        .id_table = cs4270_id,

diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 93256b39ccb6cf3bebad352e6f9b332870959116..fcf9302f59b4517b64fa8ef4a47f758bff81a85c 100644 (file)
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -245,7 +245,7 @@ static int get_parent_cell_index(struct device_node *np)
  * 'struct device'  It's ugly and hackish, but it works.
  *
  * The dev_name for such devices include the bus number and I2C address. For
- * example, "cs4270-codec.0-004f".
+ * example, "cs4270.0-004f".
  */
 static int codec_node_dev_name(struct device_node *np, char *buf, size_t len)
 {
@@ -267,7 +267,7 @@ static int codec_node_dev_name(struct device_node *np, char *buf, size_t len)
        if (!i2c)
                return -ENODEV;
 
-       snprintf(buf, len, "%s-codec.%u-%04x", temp, i2c->adapter->nr, addr);
+       snprintf(buf, len, "%s.%u-%04x", temp, i2c->adapter->nr, addr);
 
        return 0;
 }

diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
index ba1545188ec66150b953234bd086f5cccc0f0882..083706595495956005fa6b91e731dc1796de44db 100644 (file)
--- a/sound/soc/pxa/raumfeld.c
+++ b/sound/soc/pxa/raumfeld.c
@@ -232,7 +232,7 @@ static struct snd_soc_ops raumfeld_ak4104_ops = {
        .cpu_dai_name   = "pxa-ssp-dai.0",              \
        .platform_name  = "pxa-pcm-audio",              \
        .codec_dai_name = "cs4270-hifi",                \
-       .codec_name     = "cs4270-codec.0-0048",        \
+       .codec_name     = "cs4270.0-0048",      \
        .ops            = &raumfeld_cs4270_ops,         \
 }