diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-02 16:15:29 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-03 12:18:17 +0000 |
commit | c3acec2671cc448bc549b06b561ae2454238e9a0 (patch) | |
tree | 82365178227d23ed6da7d27138ffba4be58f653b /include/sound | |
parent | 1ee46ebd0435d547c078859c719d7c892ff7ab2d (diff) | |
download | op-kernel-dev-c3acec2671cc448bc549b06b561ae2454238e9a0.zip op-kernel-dev-c3acec2671cc448bc549b06b561ae2454238e9a0.tar.gz |
ASoC: Move active copy of CODEC read and write into runtime structure
We shouldn't be assigning to the driver structure (which really ought
to be const, further patch to follow) though there's unlikely to be any
actual problem except in the unlikely case that two devices with the
same driver but different bus types appear in the same system.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 4a9195c5..714a704 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -476,6 +476,8 @@ struct snd_soc_codec { void *control_data; /* codec control (i2c/3wire) data */ hw_write_t hw_write; unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int); + unsigned int (*read)(struct snd_soc_codec *, unsigned int); + int (*write)(struct snd_soc_codec *, unsigned int, unsigned int); void *reg_cache; const struct snd_soc_cache_ops *cache_ops; struct mutex cache_rw_mutex; |