diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-02 11:21:08 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-03 11:37:55 -0500 |
commit | 001ae4c0350a35e8358514326e5c3d165357979a (patch) | |
tree | f22ed323a9f480b64512289d8ec2fe781118ebbd | |
parent | fdf0f54dab8e401fd9bdd441c3fc4fa5c8837646 (diff) |
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 <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | include/sound/soc.h | 4 | ||||
-rw-r--r-- | sound/soc/soc-cache.c | 12 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 7d53cc453637..0eea08e1bdd5 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -265,7 +265,7 @@ int snd_soc_register_platform(struct device *dev, | |||
265 | struct snd_soc_platform_driver *platform_drv); | 265 | struct snd_soc_platform_driver *platform_drv); |
266 | void snd_soc_unregister_platform(struct device *dev); | 266 | void snd_soc_unregister_platform(struct device *dev); |
267 | int snd_soc_register_codec(struct device *dev, | 267 | int snd_soc_register_codec(struct device *dev, |
268 | struct snd_soc_codec_driver *codec_drv, | 268 | const struct snd_soc_codec_driver *codec_drv, |
269 | struct snd_soc_dai_driver *dai_drv, int num_dai); | 269 | struct snd_soc_dai_driver *dai_drv, int num_dai); |
270 | void snd_soc_unregister_codec(struct device *dev); | 270 | void snd_soc_unregister_codec(struct device *dev); |
271 | int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg); | 271 | int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg); |
@@ -453,7 +453,7 @@ struct snd_soc_codec { | |||
453 | const char *name_prefix; | 453 | const char *name_prefix; |
454 | int id; | 454 | int id; |
455 | struct device *dev; | 455 | struct device *dev; |
456 | struct snd_soc_codec_driver *driver; | 456 | const struct snd_soc_codec_driver *driver; |
457 | 457 | ||
458 | struct mutex mutex; | 458 | struct mutex mutex; |
459 | struct snd_soc_card *card; | 459 | struct snd_soc_card *card; |
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 6c6ced7a3819..ff2bc8beddaa 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c | |||
@@ -1078,7 +1078,7 @@ static int snd_soc_lzo_decompress_cache_block(struct snd_soc_codec *codec, | |||
1078 | static inline int snd_soc_lzo_get_blkindex(struct snd_soc_codec *codec, | 1078 | static inline int snd_soc_lzo_get_blkindex(struct snd_soc_codec *codec, |
1079 | unsigned int reg) | 1079 | unsigned int reg) |
1080 | { | 1080 | { |
1081 | struct snd_soc_codec_driver *codec_drv; | 1081 | const struct snd_soc_codec_driver *codec_drv; |
1082 | size_t reg_size; | 1082 | size_t reg_size; |
1083 | 1083 | ||
1084 | codec_drv = codec->driver; | 1084 | codec_drv = codec->driver; |
@@ -1090,7 +1090,7 @@ static inline int snd_soc_lzo_get_blkindex(struct snd_soc_codec *codec, | |||
1090 | static inline int snd_soc_lzo_get_blkpos(struct snd_soc_codec *codec, | 1090 | static inline int snd_soc_lzo_get_blkpos(struct snd_soc_codec *codec, |
1091 | unsigned int reg) | 1091 | unsigned int reg) |
1092 | { | 1092 | { |
1093 | struct snd_soc_codec_driver *codec_drv; | 1093 | const struct snd_soc_codec_driver *codec_drv; |
1094 | size_t reg_size; | 1094 | size_t reg_size; |
1095 | 1095 | ||
1096 | codec_drv = codec->driver; | 1096 | codec_drv = codec->driver; |
@@ -1101,7 +1101,7 @@ static inline int snd_soc_lzo_get_blkpos(struct snd_soc_codec *codec, | |||
1101 | 1101 | ||
1102 | static inline int snd_soc_lzo_get_blksize(struct snd_soc_codec *codec) | 1102 | static inline int snd_soc_lzo_get_blksize(struct snd_soc_codec *codec) |
1103 | { | 1103 | { |
1104 | struct snd_soc_codec_driver *codec_drv; | 1104 | const struct snd_soc_codec_driver *codec_drv; |
1105 | size_t reg_size; | 1105 | size_t reg_size; |
1106 | 1106 | ||
1107 | codec_drv = codec->driver; | 1107 | codec_drv = codec->driver; |
@@ -1301,7 +1301,7 @@ static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec) | |||
1301 | { | 1301 | { |
1302 | struct snd_soc_lzo_ctx **lzo_blocks; | 1302 | struct snd_soc_lzo_ctx **lzo_blocks; |
1303 | size_t reg_size, bmp_size; | 1303 | size_t reg_size, bmp_size; |
1304 | struct snd_soc_codec_driver *codec_drv; | 1304 | const struct snd_soc_codec_driver *codec_drv; |
1305 | int ret, tofree, i, blksize, blkcount; | 1305 | int ret, tofree, i, blksize, blkcount; |
1306 | const char *p, *end; | 1306 | const char *p, *end; |
1307 | unsigned long *sync_bmp; | 1307 | unsigned long *sync_bmp; |
@@ -1404,7 +1404,7 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec) | |||
1404 | { | 1404 | { |
1405 | int i; | 1405 | int i; |
1406 | int ret; | 1406 | int ret; |
1407 | struct snd_soc_codec_driver *codec_drv; | 1407 | const struct snd_soc_codec_driver *codec_drv; |
1408 | unsigned int val; | 1408 | unsigned int val; |
1409 | 1409 | ||
1410 | codec_drv = codec->driver; | 1410 | codec_drv = codec->driver; |
@@ -1504,7 +1504,7 @@ static int snd_soc_flat_cache_exit(struct snd_soc_codec *codec) | |||
1504 | 1504 | ||
1505 | static int snd_soc_flat_cache_init(struct snd_soc_codec *codec) | 1505 | static int snd_soc_flat_cache_init(struct snd_soc_codec *codec) |
1506 | { | 1506 | { |
1507 | struct snd_soc_codec_driver *codec_drv; | 1507 | const struct snd_soc_codec_driver *codec_drv; |
1508 | size_t reg_size; | 1508 | size_t reg_size; |
1509 | 1509 | ||
1510 | codec_drv = codec->driver; | 1510 | codec_drv = codec->driver; |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e9aa9ce59c06..78a01014079a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -3491,8 +3491,9 @@ static void fixup_codec_formats(struct snd_soc_pcm_stream *stream) | |||
3491 | * @codec: codec to register | 3491 | * @codec: codec to register |
3492 | */ | 3492 | */ |
3493 | int snd_soc_register_codec(struct device *dev, | 3493 | int snd_soc_register_codec(struct device *dev, |
3494 | struct snd_soc_codec_driver *codec_drv, | 3494 | const struct snd_soc_codec_driver *codec_drv, |
3495 | struct snd_soc_dai_driver *dai_drv, int num_dai) | 3495 | struct snd_soc_dai_driver *dai_drv, |
3496 | int num_dai) | ||
3496 | { | 3497 | { |
3497 | size_t reg_size; | 3498 | size_t reg_size; |
3498 | struct snd_soc_codec *codec; | 3499 | struct snd_soc_codec *codec; |