From 8b76c6c1d75f93b1ac299b27499789ef894c78c1 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 2 Dec 2010 16:21:08 +0000
Subject: [PATCH] --- yaml --- r: 230343 b: refs/heads/master c:
 001ae4c0350a35e8358514326e5c3d165357979a h: refs/heads/master i:   230341:
 bb241b8df792ae911b3a1188b08a9d8ceb88e360   230339:
 f29c322c9628e1478f80d7b970a110b8b57c603c   230335:
 137404e85d0606b9df03dbfe3f42227cc00ba4a2 v: v3

---
 [refs]                      |  2 +-
 trunk/include/sound/soc.h   |  4 ++--
 trunk/sound/soc/soc-cache.c | 12 ++++++------
 trunk/sound/soc/soc-core.c  |  5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 92efa6be5d94..66024d059d7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdf0f54dab8e401fd9bdd441c3fc4fa5c8837646
+refs/heads/master: 001ae4c0350a35e8358514326e5c3d165357979a
diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h
index 7d53cc453637..0eea08e1bdd5 100644
--- a/trunk/include/sound/soc.h
+++ b/trunk/include/sound/soc.h
@@ -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;
diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c
index 6c6ced7a3819..ff2bc8beddaa 100644
--- a/trunk/sound/soc/soc-cache.c
+++ b/trunk/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/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index e9aa9ce59c06..78a01014079a 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/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;