ASoC: Constify struct snd_soc_codec_driver
PATCH 1/1 ASoC: Constify struct snd_soc_codec_driver
Allow the CODEC driver structure to be marked const by making all the APIs that use it do so.
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc.h | 4 ++-- sound/soc/soc-cache.c | 13 +++++++------ sound/soc/soc-core.c | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-)
include/sound/soc.h +2 -2
@@ -265,7 +265,7 @@ int snd_soc_register_platform(struct device *dev, struct snd_soc_platform_driver *platform_drv);void snd_soc_unregister_platform (struct device *dev);int snd_soc_register_codec (struct device *dev, -struct snd_soc_codec_driver *codec_drv, +const struct snd_soc_codec_driver *codec_drv,struct snd_soc_dai_driver *dai_drv,int num_dai);void snd_soc_unregister_codec (struct device *dev);int snd_soc_codec_volatile_register (struct snd_soc_codec *codec,int reg);
@@ -453,7 +453,7 @@ struct snd_soc_codec {const char *name_prefix;int id;struct device *dev; -struct snd_soc_codec_driver *driver; +const struct snd_soc_codec_driver *driver;struct mutex mutex;struct snd_soc_card *card;
sound/soc/soc-cache.c +7 -6
@@ -1078,7 +1078,7 @@ static int snd_soc_lzo_decompress_cache_block(struct snd_soc_codec *codec,static inline int snd_soc_lzo_get_blkindex (struct snd_soc_codec *codec,unsigned int reg) { -struct snd_soc_codec_driver *codec_drv; +const struct snd_soc_codec_driver *codec_drv;size_t reg_size; codec_drv = codec->driver;
@@ -1090,7 +1090,7 @@ static inline int snd_soc_lzo_get_blkindex(struct snd_soc_codec *codec,static inline int snd_soc_lzo_get_blkpos (struct snd_soc_codec *codec,unsigned int reg) { -struct snd_soc_codec_driver *codec_drv; +const struct snd_soc_codec_driver *codec_drv;size_t reg_size; codec_drv = codec->driver;
@@ -1101,7 +1101,7 @@ static inline int snd_soc_lzo_get_blkpos(struct snd_soc_codec *codec,static inline int snd_soc_lzo_get_blksize (struct snd_soc_codec *codec) { -struct snd_soc_codec_driver *codec_drv; +const struct snd_soc_codec_driver *codec_drv;size_t reg_size; codec_drv = codec->driver;
@@ -1301,10 +1301,11 @@ static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec) {struct snd_soc_lzo_ctx **lzo_blocks;size_t reg_size, bmp_size; -struct snd_soc_codec_driver *codec_drv; +const struct snd_soc_codec_driver *codec_drv;int ret, tofree, i, blksize, blkcount;const char *p, *end;unsigned long *sync_bmp; +const char *reg_default; ret =0 ; codec_drv = codec->driver;
@@ -1404,7 +1405,7 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec) {int i;int ret; -struct snd_soc_codec_driver *codec_drv; +const struct snd_soc_codec_driver *codec_drv;unsigned int val; codec_drv = codec->driver;
@@ -1504,7 +1505,7 @@ static int snd_soc_flat_cache_exit(struct snd_soc_codec *codec)static int snd_soc_flat_cache_init (struct snd_soc_codec *codec) { -struct snd_soc_codec_driver *codec_drv; +const struct snd_soc_codec_driver *codec_drv;size_t reg_size; codec_drv = codec->driver;
sound/soc/soc-core.c +3 -2
@@ -3487,8 +3487,9 @@ static void fixup_codec_formats(struct snd_soc_pcm_stream *stream)* @codec: codec to register */ int snd_soc_register_codec (struct device *dev, -struct snd_soc_codec_driver *codec_drv, -struct snd_soc_dai_driver *dai_drv,int num_dai) +const struct snd_soc_codec_driver *codec_drv, +struct snd_soc_dai_driver *dai_drv, +int num_dai) {size_t reg_size;struct snd_soc_codec *codec;
Signature · 1 line
1.7.1
Quoted 10 lines · Mark Brown
Allow the CODEC driver structure to be marked const by making all the APIs that use it do so.
Signed-off-by Mark Brown <[email protected]>--- include/sound/soc.h | 4 ++-- sound/soc/soc-cache.c | 13 +++++++------ sound/soc/soc-core.c | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-)
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk