diff options
| author | Barry Song <21cnbao@gmail.com> | 2009-09-20 23:20:51 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-21 19:58:33 -0400 |
| commit | 98235a4bb01f288c82f7b878996e507f6159fd69 (patch) | |
| tree | 14c6c28fc6d95742da7cd001cef608211954b794 | |
| parent | 0c31cf3e4af79ea18bbd365b07ef0de207673894 (diff) | |
ASoC: some minor changes for AD1836 and AD1938 codec drivers
1. delete redundant assignment to bus field in spi_driver structure
2. fix lost assignment to set_bias_level entry in ad1938 codec dai
3. change spi driver name of ad1836 from "ad1836-spi" to "ad1836"
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/ad1836.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/ad1938.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index 01343dc984f..c48485f2c55 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c | |||
| @@ -251,8 +251,7 @@ static int __devexit ad1836_spi_remove(struct spi_device *spi) | |||
| 251 | 251 | ||
| 252 | static struct spi_driver ad1836_spi_driver = { | 252 | static struct spi_driver ad1836_spi_driver = { |
| 253 | .driver = { | 253 | .driver = { |
| 254 | .name = "ad1836-spi", | 254 | .name = "ad1836", |
| 255 | .bus = &spi_bus_type, | ||
| 256 | .owner = THIS_MODULE, | 255 | .owner = THIS_MODULE, |
| 257 | }, | 256 | }, |
| 258 | .probe = ad1836_spi_probe, | 257 | .probe = ad1836_spi_probe, |
diff --git a/sound/soc/codecs/ad1938.c b/sound/soc/codecs/ad1938.c index 9a049a1995a..34b30efc3cb 100644 --- a/sound/soc/codecs/ad1938.c +++ b/sound/soc/codecs/ad1938.c | |||
| @@ -456,7 +456,6 @@ static int __devexit ad1938_spi_remove(struct spi_device *spi) | |||
| 456 | static struct spi_driver ad1938_spi_driver = { | 456 | static struct spi_driver ad1938_spi_driver = { |
| 457 | .driver = { | 457 | .driver = { |
| 458 | .name = "ad1938", | 458 | .name = "ad1938", |
| 459 | .bus = &spi_bus_type, | ||
| 460 | .owner = THIS_MODULE, | 459 | .owner = THIS_MODULE, |
| 461 | }, | 460 | }, |
| 462 | .probe = ad1938_spi_probe, | 461 | .probe = ad1938_spi_probe, |
| @@ -515,6 +514,7 @@ static int ad1938_register(struct ad1938_priv *ad1938) | |||
| 515 | codec->num_dai = 1; | 514 | codec->num_dai = 1; |
| 516 | codec->write = ad1938_write_reg; | 515 | codec->write = ad1938_write_reg; |
| 517 | codec->read = ad1938_read_reg_cache; | 516 | codec->read = ad1938_read_reg_cache; |
| 517 | codec->set_bias_level = ad1938_set_bias_level; | ||
| 518 | INIT_LIST_HEAD(&codec->dapm_widgets); | 518 | INIT_LIST_HEAD(&codec->dapm_widgets); |
| 519 | INIT_LIST_HEAD(&codec->dapm_paths); | 519 | INIT_LIST_HEAD(&codec->dapm_paths); |
| 520 | 520 | ||
