summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhumika Goyal <bhumirks@gmail.com>2017-03-13 15:46:40 -0400
committerMark Brown <broonie@kernel.org>2017-03-15 09:34:16 -0400
commit943b73112dfdd6747871a3347f70de6876f4dd4b (patch)
tree54e60745b52efab45ed1a03483f4555a2d602367
parent7be5c5fe9287c7f5cc0f2f3c742d602c82daa2d6 (diff)
ASoC: pxa: constify snd_soc_ops structures
Declare snd_soc_ops structures as const as they are only stored in the ops field of a snd_soc_dai_link structure. This field is of type const, so snd_soc_ops structures having this property can be made const too. The .o files did not compile for all the changed .c files. Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/pxa/brownstone.c2
-rw-r--r--sound/soc/pxa/corgi.c2
-rw-r--r--sound/soc/pxa/hx4700.c2
-rw-r--r--sound/soc/pxa/imote2.c2
-rw-r--r--sound/soc/pxa/magician.c4
-rw-r--r--sound/soc/pxa/poodle.c2
-rw-r--r--sound/soc/pxa/raumfeld.c2
-rw-r--r--sound/soc/pxa/spitz.c2
-rw-r--r--sound/soc/pxa/tosa.c2
-rw-r--r--sound/soc/pxa/z2.c2
-rw-r--r--sound/soc/pxa/zylonite.c2
11 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index b6cb9950f05d..9a3f5b799720 100644
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -74,7 +74,7 @@ static int brownstone_wm8994_hw_params(struct snd_pcm_substream *substream,
74} 74}
75 75
76/* machine stream operations */ 76/* machine stream operations */
77static struct snd_soc_ops brownstone_ops = { 77static const struct snd_soc_ops brownstone_ops = {
78 .hw_params = brownstone_wm8994_hw_params, 78 .hw_params = brownstone_wm8994_hw_params,
79}; 79};
80 80
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 311774e9ca46..054e0d65db9d 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -154,7 +154,7 @@ static int corgi_hw_params(struct snd_pcm_substream *substream,
154 return 0; 154 return 0;
155} 155}
156 156
157static struct snd_soc_ops corgi_ops = { 157static const struct snd_soc_ops corgi_ops = {
158 .startup = corgi_startup, 158 .startup = corgi_startup,
159 .hw_params = corgi_hw_params, 159 .hw_params = corgi_hw_params,
160 .shutdown = corgi_shutdown, 160 .shutdown = corgi_shutdown,
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index 85483049b916..a9ac881c2e14 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -79,7 +79,7 @@ static int hx4700_hw_params(struct snd_pcm_substream *substream,
79 return 0; 79 return 0;
80} 80}
81 81
82static struct snd_soc_ops hx4700_ops = { 82static const struct snd_soc_ops hx4700_ops = {
83 .hw_params = hx4700_hw_params, 83 .hw_params = hx4700_hw_params,
84}; 84};
85 85
diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index 9d0e40771ef5..78475376f971 100644
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -42,7 +42,7 @@ static int imote2_asoc_hw_params(struct snd_pcm_substream *substream,
42 return ret; 42 return ret;
43} 43}
44 44
45static struct snd_soc_ops imote2_asoc_ops = { 45static const struct snd_soc_ops imote2_asoc_ops = {
46 .hw_params = imote2_asoc_hw_params, 46 .hw_params = imote2_asoc_hw_params,
47}; 47};
48 48
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 2d4d4455fe87..2fc012b06c43 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -255,12 +255,12 @@ static int magician_capture_hw_params(struct snd_pcm_substream *substream,
255 return 0; 255 return 0;
256} 256}
257 257
258static struct snd_soc_ops magician_capture_ops = { 258static const struct snd_soc_ops magician_capture_ops = {
259 .startup = magician_startup, 259 .startup = magician_startup,
260 .hw_params = magician_capture_hw_params, 260 .hw_params = magician_capture_hw_params,
261}; 261};
262 262
263static struct snd_soc_ops magician_playback_ops = { 263static const struct snd_soc_ops magician_playback_ops = {
264 .startup = magician_startup, 264 .startup = magician_startup,
265 .hw_params = magician_playback_hw_params, 265 .hw_params = magician_playback_hw_params,
266}; 266};
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index a879aba0691f..b6693f32fc02 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -129,7 +129,7 @@ static int poodle_hw_params(struct snd_pcm_substream *substream,
129 return 0; 129 return 0;
130} 130}
131 131
132static struct snd_soc_ops poodle_ops = { 132static const struct snd_soc_ops poodle_ops = {
133 .startup = poodle_startup, 133 .startup = poodle_startup,
134 .hw_params = poodle_hw_params, 134 .hw_params = poodle_hw_params,
135 .shutdown = poodle_shutdown, 135 .shutdown = poodle_shutdown,
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
index 47c91730e93c..111a907c4eb9 100644
--- a/sound/soc/pxa/raumfeld.c
+++ b/sound/soc/pxa/raumfeld.c
@@ -132,7 +132,7 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
132 return 0; 132 return 0;
133} 133}
134 134
135static struct snd_soc_ops raumfeld_cs4270_ops = { 135static const struct snd_soc_ops raumfeld_cs4270_ops = {
136 .startup = raumfeld_cs4270_startup, 136 .startup = raumfeld_cs4270_startup,
137 .shutdown = raumfeld_cs4270_shutdown, 137 .shutdown = raumfeld_cs4270_shutdown,
138 .hw_params = raumfeld_cs4270_hw_params, 138 .hw_params = raumfeld_cs4270_hw_params,
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index d38a2b519c52..1671da648e95 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -156,7 +156,7 @@ static int spitz_hw_params(struct snd_pcm_substream *substream,
156 return 0; 156 return 0;
157} 157}
158 158
159static struct snd_soc_ops spitz_ops = { 159static const struct snd_soc_ops spitz_ops = {
160 .startup = spitz_startup, 160 .startup = spitz_startup,
161 .hw_params = spitz_hw_params, 161 .hw_params = spitz_hw_params,
162}; 162};
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 1812748b75bf..ae9c12e1ea2a 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -85,7 +85,7 @@ static int tosa_startup(struct snd_pcm_substream *substream)
85 return 0; 85 return 0;
86} 86}
87 87
88static struct snd_soc_ops tosa_ops = { 88static const struct snd_soc_ops tosa_ops = {
89 .startup = tosa_startup, 89 .startup = tosa_startup,
90}; 90};
91 91
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 6d88d9acc666..5b0eccd2b4dd 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -152,7 +152,7 @@ err:
152 return ret; 152 return ret;
153} 153}
154 154
155static struct snd_soc_ops z2_ops = { 155static const struct snd_soc_ops z2_ops = {
156 .hw_params = z2_hw_params, 156 .hw_params = z2_hw_params,
157}; 157};
158 158
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 6fbcdf02c88d..ba468e560dd2 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -132,7 +132,7 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
132 return 0; 132 return 0;
133} 133}
134 134
135static struct snd_soc_ops zylonite_voice_ops = { 135static const struct snd_soc_ops zylonite_voice_ops = {
136 .hw_params = zylonite_voice_hw_params, 136 .hw_params = zylonite_voice_hw_params,
137}; 137};
138 138