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

Commit 64902b29 authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

ASoC: Remove unnecessary -codec from cs4270 driver name 



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

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7c59bc55

sound/soc/codecs/cs4270.c

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

sound/soc/fsl/mpc8610_hpcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/pxa/raumfeld.c

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

}