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 <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index b6cb9950f05d5126ff7a4aeb731e16ab44448e99..9a3f5b7997208125136d03a72a159c0777d17a9c 100644 (file)
--- 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,
 }
 
 /* machine stream operations */
-static struct snd_soc_ops brownstone_ops = {
+static const struct snd_soc_ops brownstone_ops = {
        .hw_params = brownstone_wm8994_hw_params,
 };
 

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 311774e9ca469197e1aec91523ecbb8e9135ee0f..054e0d65db9d7764c9b1d043f79d6c51e74941fb 100644 (file)
--- 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,
        return 0;
 }
 
-static struct snd_soc_ops corgi_ops = {
+static const struct snd_soc_ops corgi_ops = {
        .startup = corgi_startup,
        .hw_params = corgi_hw_params,
        .shutdown = corgi_shutdown,

diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index 85483049b916db5fef5fee39b97e4fb7fbcc71e8..a9ac881c2e143acef4e655e0056269ab813ff32b 100644 (file)
--- 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,
        return 0;
 }
 
-static struct snd_soc_ops hx4700_ops = {
+static const struct snd_soc_ops hx4700_ops = {
        .hw_params = hx4700_hw_params,
 };
 

diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index 9d0e40771ef5b01de482aeb9daef67c15f30297f..78475376f971db9a63d36a33555b30fcf02da106 100644 (file)
--- 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,
        return ret;
 }
 
-static struct snd_soc_ops imote2_asoc_ops = {
+static const struct snd_soc_ops imote2_asoc_ops = {
        .hw_params = imote2_asoc_hw_params,
 };
 

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 2d4d4455fe8769a0eee091fd1bdc2cd3cdc711fe..2fc012b06c439bcba72b436e271e1ed26abafb36 100644 (file)
--- 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,
        return 0;
 }
 
-static struct snd_soc_ops magician_capture_ops = {
+static const struct snd_soc_ops magician_capture_ops = {
        .startup = magician_startup,
        .hw_params = magician_capture_hw_params,
 };
 
-static struct snd_soc_ops magician_playback_ops = {
+static const struct snd_soc_ops magician_playback_ops = {
        .startup = magician_startup,
        .hw_params = magician_playback_hw_params,
 };

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index a879aba0691fe7d20f2e6be6e39c08a632c20dd4..b6693f32fc0273a0c9fb6d9c2042941eb90be510 100644 (file)
--- 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,
        return 0;
 }
 
-static struct snd_soc_ops poodle_ops = {
+static const struct snd_soc_ops poodle_ops = {
        .startup = poodle_startup,
        .hw_params = poodle_hw_params,
        .shutdown = poodle_shutdown,

diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
index 47c91730e93c2e84bb8e839486c9aedcad08542e..111a907c4eb985c22d5580dd9d09d00fe6459b00 100644 (file)
--- 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,
        return 0;
 }
 
-static struct snd_soc_ops raumfeld_cs4270_ops = {
+static const struct snd_soc_ops raumfeld_cs4270_ops = {
        .startup = raumfeld_cs4270_startup,
        .shutdown = raumfeld_cs4270_shutdown,
        .hw_params = raumfeld_cs4270_hw_params,

diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index d38a2b519c52991132aebd824e98b1553a9a621c..1671da648e95985ce97db086082ce43e1662c5c5 100644 (file)
--- 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,
        return 0;
 }
 
-static struct snd_soc_ops spitz_ops = {
+static const struct snd_soc_ops spitz_ops = {
        .startup = spitz_startup,
        .hw_params = spitz_hw_params,
 };

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 1812748b75bfa84f2dc37d7163216551015dcb68..ae9c12e1ea2aeccd1941e5a6e2997ed367b2833e 100644 (file)
--- 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)
        return 0;
 }
 
-static struct snd_soc_ops tosa_ops = {
+static const struct snd_soc_ops tosa_ops = {
        .startup = tosa_startup,
 };
 

diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 6d88d9acc6666b4982db64518e9f10667b1735d2..5b0eccd2b4ddee37412ed68eb46e4370c50683db 100644 (file)
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -152,7 +152,7 @@ err:
        return ret;
 }
 
-static struct snd_soc_ops z2_ops = {
+static const struct snd_soc_ops z2_ops = {
        .hw_params = z2_hw_params,
 };
 

diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 6fbcdf02c88dbc292ddeb6ea3c9d0accaed384ab..ba468e560dd257bdbd460288141dff75c0babaf6 100644 (file)
--- 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,
        return 0;
 }
 
-static struct snd_soc_ops zylonite_voice_ops = {
+static const struct snd_soc_ops zylonite_voice_ops = {
        .hw_params = zylonite_voice_hw_params,
 };