Skip to content

Commit

Permalink
ASoC: AD1836: Remove unused fields from private struct
Browse files Browse the repository at this point in the history
The control_type field is never used, so it can be removed.  The
control_data field is used to initialize the codec's control_data field,
but since this is also done by the snd-soc-cache core, the redundant
assignment can be removed and the field can be dropped.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Jun 6, 2011
1 parent 874ce77 commit 583eada
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions sound/soc/codecs/ad1836.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ enum ad1836_type {

/* codec private data */
struct ad1836_priv {
enum snd_soc_control_type control_type;
void *control_data;
enum ad1836_type type;
};

Expand Down Expand Up @@ -257,7 +255,6 @@ static int ad1836_probe(struct snd_soc_codec *codec)
num_dacs = ad183x_dais[ad1836->type].playback.channels_max / 2;
num_adcs = ad183x_dais[ad1836->type].capture.channels_max / 2;

codec->control_data = ad1836->control_data;
ret = snd_soc_codec_set_cache_io(codec, 4, 12, SND_SOC_SPI);
if (ret < 0) {
dev_err(codec->dev, "failed to set cache I/O: %d\n",
Expand Down Expand Up @@ -350,8 +347,6 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi)
ad1836->type = spi_get_device_id(spi)->driver_data;

spi_set_drvdata(spi, ad1836);
ad1836->control_data = spi;
ad1836->control_type = SND_SOC_SPI;

ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_ad1836, &ad183x_dais[ad1836->type], 1);
Expand Down

0 comments on commit 583eada

Please sign in to comment.