[alsa-devel] [PATCH] ASoC: soc-core: Remove display_register() callback
Remove the display_register() callback as there are no users of it in the upstream kernel and makes it difficult to unify the format of the codec_reg file.
Signed-off-by: Dimitris Papastamos dp@opensource.wolfsonmicro.com --- include/sound/soc.h | 2 -- sound/soc/soc-core.c | 31 +++++++++++++------------------ 2 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index 4b6c0a8..2e6463f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -536,8 +536,6 @@ struct snd_soc_codec_driver { /* codec IO */ unsigned int (*read)(struct snd_soc_codec *, unsigned int); int (*write)(struct snd_soc_codec *, unsigned int, unsigned int); - int (*display_register)(struct snd_soc_codec *, char *, - size_t, unsigned int); int (*volatile_register)(struct snd_soc_codec *, unsigned int); int (*readable_register)(struct snd_soc_codec *, unsigned int); short reg_cache_size; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 205cbd7..4c061c3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -110,24 +110,19 @@ static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf) if (count >= PAGE_SIZE - 1) break;
- if (codec->driver->display_register) { - count += codec->driver->display_register(codec, buf + count, - PAGE_SIZE - count, i); - } else { - /* If the read fails it's almost certainly due to - * the register being volatile and the device being - * powered off. - */ - ret = snd_soc_read(codec, i); - if (ret >= 0) - count += snprintf(buf + count, - PAGE_SIZE - count, - "%.*x", wordsize, ret); - else - count += snprintf(buf + count, - PAGE_SIZE - count, - "<no data: %d>", ret); - } + /* If the read fails it's almost certainly due to + * the register being volatile and the device being + * powered off. + */ + ret = snd_soc_read(codec, i); + if (ret >= 0) + count += snprintf(buf + count, + PAGE_SIZE - count, + "%.*x", wordsize, ret); + else + count += snprintf(buf + count, + PAGE_SIZE - count, + "<no data: %d>", ret);
if (count >= PAGE_SIZE - 1) break;
On Wed, Feb 02, 2011 at 10:20:54AM +0000, Dimitris Papastamos wrote:
Remove the display_register() callback as there are no users of it in the upstream kernel and makes it difficult to unify the format of the codec_reg file.
Signed-off-by: Dimitris Papastamos dp@opensource.wolfsonmicro.com
This was rather strongly requested for some devices with extremely large registers (128 bits at least IIRC) which may eventually make it to mainline. It seems better to just have some sort of fallback for those devices, if it causes output problems people can always fix those.
On Wed, Feb 2, 2011 at 5:23 AM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
On Wed, Feb 02, 2011 at 10:20:54AM +0000, Dimitris Papastamos wrote:
Remove the display_register() callback as there are no users of it in the upstream kernel and makes it difficult to unify the format of the codec_reg file.
Signed-off-by: Dimitris Papastamos dp@opensource.wolfsonmicro.com
This was rather strongly requested for some devices with extremely large registers (128 bits at least IIRC) which may eventually make it to mainline. It seems better to just have some sort of fallback for those devices, if it causes output problems people can always fix those.
TI Codec devices have two problems: 1) large registers - up to 128 bits 2) sparse register maps - big gaps between valid register addresses.
On Wed, Feb 02, 2011 at 09:50:40AM -0500, jonsmirl@gmail.com wrote:
TI Codec devices have two problems:
- large registers - up to 128 bits
- sparse register maps - big gaps between valid register addresses.
The sparse register maps are already very well handled, they're quite widespread.
On Wed, 2011-02-02 at 09:50 -0500, jonsmirl@gmail.com wrote:
On Wed, Feb 2, 2011 at 5:23 AM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
On Wed, Feb 02, 2011 at 10:20:54AM +0000, Dimitris Papastamos wrote:
Remove the display_register() callback as there are no users of it in the upstream kernel and makes it difficult to unify the format of the codec_reg file.
Signed-off-by: Dimitris Papastamos dp@opensource.wolfsonmicro.com
This was rather strongly requested for some devices with extremely large registers (128 bits at least IIRC) which may eventually make it to mainline. It seems better to just have some sort of fallback for those devices, if it causes output problems people can always fix those.
TI Codec devices have two problems:
- large registers - up to 128 bits
- sparse register maps - big gaps between valid register addresses.
Yes, I've dropped the patch.
Thanks, Dimitris
participants (3)
-
Dimitris Papastamos -
jonsmirl＠gmail.com -
Mark Brown