Commit 001ae4c0 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent fdf0f54d

include/sound/soc.h

+2 −2
Original line number Diff line number Diff line
@@ -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

+6 −6
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-core.c

+3 −2
Original line number Diff line number Diff line
@@ -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;