Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dma

2 files changed, 4 insertions, 6 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e1ef63d4a5c4..d4c004929ae5 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -565,7 +565,6 @@ struct snd_soc_dapm_update {
 
 /* DAPM context */
 struct snd_soc_dapm_context {
-        int n_widgets; /* number of widgets in this context */
         enum snd_soc_bias_level bias_level;
         enum snd_soc_bias_level suspend_bias_level;
         struct delayed_work delayed_work;
diff --git a/include/sound/soc.h b/include/sound/soc.h
index a6a059ca3874..f619905f0a65 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -371,7 +371,7 @@ int snd_soc_suspend(struct device *dev);
 int snd_soc_resume(struct device *dev);
 int snd_soc_poweroff(struct device *dev);
 int snd_soc_register_platform(struct device *dev,
-                struct snd_soc_platform_driver *platform_drv);
+                const struct snd_soc_platform_driver *platform_drv);
 void snd_soc_unregister_platform(struct device *dev);
 int snd_soc_register_codec(struct device *dev,
                 const struct snd_soc_codec_driver *codec_drv,
@@ -801,10 +801,10 @@ struct snd_soc_platform_driver {
                 struct snd_soc_dai *);
 
         /* platform stream pcm ops */
-        struct snd_pcm_ops *ops;
+        const struct snd_pcm_ops *ops;
 
         /* platform stream compress ops */
-        struct snd_compr_ops *compr_ops;
+        const struct snd_compr_ops *compr_ops;
 
         /* platform stream completion event */
         int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
@@ -823,7 +823,7 @@ struct snd_soc_platform {
         const char *name;
         int id;
         struct device *dev;
-        struct snd_soc_platform_driver *driver;
+        const struct snd_soc_platform_driver *driver;
         struct mutex mutex;
 
         unsigned int suspended:1; /* platform is suspended */
@@ -1086,7 +1086,6 @@ struct soc_enum {
         unsigned int mask;
         const char * const *texts;
         const unsigned int *values;
-        void *dapm;
 };
 
 /* codec IO */