ASoC: ad193x: tweak style to match other codecs
Subsystems (3)
PATCH 1/1 ASoC: ad193x: tweak style to match other codecs
From: Scott Jiang <[email protected]>
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 <[email protected]>
Signed-off-by Mike Frysinger <[email protected]>
--- sound/soc/codecs/ad193x.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-)
sound/soc/codecs/ad193x.c +7 -12
@@ -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 );
Signature · 1 line
1.7.4.1
Quoted 8 lines · Mike Frysinger
From: Scott Jiang <[email protected]>
Rename the
snd_soc_control_typefield from "bus_type" to "control_type", and drop the now unused "control_data" field.Signed-off-by Scott Jiang <[email protected]>Signed-off-by Mike Frysinger <[email protected]>---
Acked-by Liam Girdwood <[email protected]>
Mark Brown
AppliedQuoted 7 lines · Mike Frysinger
From: Scott Jiang <[email protected]>
Rename the
snd_soc_control_typefield from "bus_type" to "control_type", and drop the now unused "control_data" field.Signed-off-by Scott Jiang <[email protected]>Signed-off-by Mike Frysinger <[email protected]>
Applied, thanks.