aboutsummaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown2010-12-02 16:21:08 +0000
committerMark Brown2010-12-03 16:37:55 +0000
commit001ae4c0350a35e8358514326e5c3d165357979a (patch)
treef22ed323a9f480b64512289d8ec2fe781118ebbd /sound/soc
parentfdf0f54dab8e401fd9bdd441c3fc4fa5c8837646 (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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-cache.c12
-rw-r--r--sound/soc/soc-core.c5
2 files changed, 9 insertions, 8 deletions
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,
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,7 +1301,7 @@ 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;
@@ -1404,7 +1404,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 +1504,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;
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)
* @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;