aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-03-27 07:02:22 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-27 19:08:35 -0400
commitd79e57db84f8359bc96418900f86b8fc4189eff9 (patch)
tree30ce0538e4c1ebd72498d8083b4da2a32d7c1256
parent36300fd09823be8f7d6feaaa79ddbf54cf205378 (diff)
ASoC: Constify the 'driver' field of snd_soc_platform
The ASoC core does no not modify the driver of a platform. Making it const allows ASoC platform drivers to declare the snd_soc_platform_driver struct as const. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/sound/soc.h4
-rw-r--r--sound/soc/soc-core.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index c84062b22221..5fb70d1e8cce 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -371,7 +371,7 @@ int snd_soc_suspend(struct device *dev);
371int snd_soc_resume(struct device *dev); 371int snd_soc_resume(struct device *dev);
372int snd_soc_poweroff(struct device *dev); 372int snd_soc_poweroff(struct device *dev);
373int snd_soc_register_platform(struct device *dev, 373int snd_soc_register_platform(struct device *dev,
374 struct snd_soc_platform_driver *platform_drv); 374 const struct snd_soc_platform_driver *platform_drv);
375void snd_soc_unregister_platform(struct device *dev); 375void snd_soc_unregister_platform(struct device *dev);
376int snd_soc_register_codec(struct device *dev, 376int snd_soc_register_codec(struct device *dev,
377 const struct snd_soc_codec_driver *codec_drv, 377 const struct snd_soc_codec_driver *codec_drv,
@@ -823,7 +823,7 @@ struct snd_soc_platform {
823 const char *name; 823 const char *name;
824 int id; 824 int id;
825 struct device *dev; 825 struct device *dev;
826 struct snd_soc_platform_driver *driver; 826 const struct snd_soc_platform_driver *driver;
827 struct mutex mutex; 827 struct mutex mutex;
828 828
829 unsigned int suspended:1; /* platform is suspended */ 829 unsigned int suspended:1; /* platform is suspended */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 0ce075c47b25..4d24b5ea3ba7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3906,7 +3906,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);
3906 * @platform: platform to register 3906 * @platform: platform to register
3907 */ 3907 */
3908int snd_soc_register_platform(struct device *dev, 3908int snd_soc_register_platform(struct device *dev,
3909 struct snd_soc_platform_driver *platform_drv) 3909 const struct snd_soc_platform_driver *platform_drv)
3910{ 3910{
3911 struct snd_soc_platform *platform; 3911 struct snd_soc_platform *platform;
3912 3912