ASoC: ad193x: tweak style to match other codecs
Rename the snd_soc_control_type field from "bus_type" to "control_type", and drop the now unused "control_data" field. Signed-off-by: Scott Jiang <scott.jiang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
4b2ffc205c
commit
119bfef2f9
|
@ -23,8 +23,7 @@
|
|||
|
||||
/* codec private data */
|
||||
struct ad193x_priv {
|
||||
enum snd_soc_control_type bus_type;
|
||||
void *control_data;
|
||||
enum snd_soc_control_type control_type;
|
||||
int sysclk;
|
||||
};
|
||||
|
||||
|
@ -354,14 +353,12 @@ static int ad193x_probe(struct snd_soc_codec *codec)
|
|||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
int ret;
|
||||
|
||||
codec->control_data = ad193x->control_data;
|
||||
if (ad193x->bus_type == SND_SOC_I2C)
|
||||
ret = snd_soc_codec_set_cache_io(codec, 8, 8, ad193x->bus_type);
|
||||
if (ad193x->control_type == SND_SOC_I2C)
|
||||
ret = snd_soc_codec_set_cache_io(codec, 8, 8, ad193x->control_type);
|
||||
else
|
||||
ret = snd_soc_codec_set_cache_io(codec, 16, 8, ad193x->bus_type);
|
||||
ret = snd_soc_codec_set_cache_io(codec, 16, 8, ad193x->control_type);
|
||||
if (ret < 0) {
|
||||
dev_err(codec->dev, "failed to set cache I/O: %d\n",
|
||||
ret);
|
||||
dev_err(codec->dev, "failed to set cache I/O: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -408,8 +405,7 @@ static int __devinit ad193x_spi_probe(struct spi_device *spi)
|
|||
return -ENOMEM;
|
||||
|
||||
spi_set_drvdata(spi, ad193x);
|
||||
ad193x->control_data = spi;
|
||||
ad193x->bus_type = SND_SOC_SPI;
|
||||
ad193x->control_type = SND_SOC_SPI;
|
||||
|
||||
ret = snd_soc_register_codec(&spi->dev,
|
||||
&soc_codec_dev_ad193x, &ad193x_dai, 1);
|
||||
|
@ -454,8 +450,7 @@ static int __devinit ad193x_i2c_probe(struct i2c_client *client,
|
|||
return -ENOMEM;
|
||||
|
||||
i2c_set_clientdata(client, ad193x);
|
||||
ad193x->control_data = client;
|
||||
ad193x->bus_type = SND_SOC_I2C;
|
||||
ad193x->control_type = SND_SOC_I2C;
|
||||
|
||||
ret = snd_soc_register_codec(&client->dev,
|
||||
&soc_codec_dev_ad193x, &ad193x_dai, 1);
|
||||
|
|
Loading…
Reference in a new issue