ASoC: Drop unused state parameter from CODEC suspend callback

The existence of this parameter is purely historical. None of the CODEC drivers
uses it and we always pass in the same value anyway, so it should be safe to
remove it.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 737a4f4b18ff725c52b1e3c6587dab3b3e90c69f..d9aa66be1994c5e12b3af589a11e75182e5b9238 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -592,8 +592,7 @@ struct snd_soc_codec_driver {
        /* driver ops */
        int (*probe)(struct snd_soc_codec *);
        int (*remove)(struct snd_soc_codec *);
-       int (*suspend)(struct snd_soc_codec *,
-                       pm_message_t state);
+       int (*suspend)(struct snd_soc_codec *);
        int (*resume)(struct snd_soc_codec *);
 
        /* Default control and setup, added after probe() is run */

diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index 221ec29f68e38361cb073ff0c975de51f47e7762..1bbad4c16d289fe29f7c20702138db81f4f093d5 100644 (file)
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -99,7 +99,7 @@ static int ac97_soc_remove(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int ac97_soc_suspend(struct snd_soc_codec *codec, pm_message_t msg)
+static int ac97_soc_suspend(struct snd_soc_codec *codec)
 {
        snd_ac97_suspend(codec->ac97);
 

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index fab0948f7a548cc23a9bb3e44ae2d63c59ded5e4..919322daf6dd5fd3f021d1364f679dbae5bf3a20 100644 (file)
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -223,7 +223,7 @@ static struct snd_soc_dai_driver ad183x_dais[] = {
 };
 
 #ifdef CONFIG_PM
-static int ad1836_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int ad1836_suspend(struct snd_soc_codec *codec)
 {
        /* reset clock control mode */
        return snd_soc_update_bits(codec, AD1836_ADC_CTRL2,

diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index 45c63028b40d1636b56f6aa3e5f13e0d110b9a5d..637b114bea7f86c36d591f01cd9661b48c638d89 100644 (file)
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -1321,7 +1321,7 @@ static int adau1373_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static int adau1373_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int adau1373_suspend(struct snd_soc_codec *codec)
 {
        return adau1373_set_bias_level(codec, SND_SOC_BIAS_OFF);
 }

diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index f9f08948e5e878f12d40a1f337d6d40c7247119e..ebd7b37b902bb4019dee2059a633c120d20cc4f7 100644 (file)
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -798,7 +798,7 @@ static int adav80x_probe(struct snd_soc_codec *codec)
        return adav80x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 }
 
-static int adav80x_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int adav80x_suspend(struct snd_soc_codec *codec)
 {
        return adav80x_set_bias_level(codec, SND_SOC_BIAS_OFF);
 }

diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index e1f531085453df4e62d612f8169c6572d4a0fead..96296fd172f9b7ac60805341e0d06759abbc0d3c 100644 (file)
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -354,7 +354,7 @@ static struct snd_soc_dai_driver ak4535_dai = {
        .ops = &ak4535_dai_ops,
 };
 
-static int ak4535_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int ak4535_suspend(struct snd_soc_codec *codec)
 {
        ak4535_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index f53f314805656db959f2c536953c73e5abc6325e..90184701480d64d78fb973fa35cf1ebcca9c8336 100644 (file)
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -498,7 +498,7 @@ static struct snd_soc_dai_driver ak4641_dai[] = {
 },
 };
 
-static int ak4641_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int ak4641_suspend(struct snd_soc_codec *codec)
 {
        ak4641_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index 6a5c001e8ba8ae6ab2390e2e643effbf2373f12a..da97f024ec74891048921d70eea88dbf3dc3623c 100644 (file)
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -868,7 +868,7 @@ static struct snd_soc_dai_driver alc5623_dai = {
        .ops = &alc5623_dai_ops,
 };
 
-static int alc5623_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
+static int alc5623_suspend(struct snd_soc_codec *codec)
 {
        alc5623_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index 3f750def896704e26b49690e1012ad1ebb743d4b..08613c7e1091ae55b322f4d5ef1b3158b7b9683a 100644 (file)
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -956,7 +956,7 @@ static struct snd_soc_dai_driver alc5632_dai = {
 };
 
 #ifdef CONFIG_PM
-static int alc5632_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
+static int alc5632_suspend(struct snd_soc_codec *codec)
 {
        alc5632_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index dc77ff7ba339719075d520f4d730a25924ab4656..fef0f48330e4fdd8cc0bc12d892608c621a1d311 100644 (file)
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -578,7 +578,7 @@ static int cs4270_remove(struct snd_soc_codec *codec)
  * and all registers are written back to the hardware when resuming.
  */
 
-static int cs4270_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
+static int cs4270_soc_suspend(struct snd_soc_codec *codec)
 {
        struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
        int reg, ret;

diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index a6f77a855f45273a7f831f8a7320ddb119f4e6ff..f6fe846b6a6c3d76f8778140261c96b0ed7a65eb 100644 (file)
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -430,7 +430,7 @@ static struct snd_soc_dai_driver cs4271_dai = {
 };
 
 #ifdef CONFIG_PM
-static int cs4271_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
+static int cs4271_soc_suspend(struct snd_soc_codec *codec)
 {
        int ret;
        /* Set power-down bit */

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index da3125aa55f9a7725815fd04f01da11c30f9c609..9d38db8f1919d3b81bf6d7f68b99232ad324331e 100644 (file)
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1262,7 +1262,7 @@ static struct snd_soc_dai_driver cs42l73_dai[] = {
         }
 };
 
-static int cs42l73_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int cs42l73_suspend(struct snd_soc_codec *codec)
 {
        cs42l73_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
index 4fca8bccd53573f2bacffe88bdead55288e3d3a3..517e2a516daf68b39db24e4d9c0911993ea00f29 100644 (file)
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -311,7 +311,7 @@ static int jz4740_codec_dev_remove(struct snd_soc_codec *codec)
 
 #ifdef CONFIG_PM_SLEEP
 
-static int jz4740_codec_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int jz4740_codec_suspend(struct snd_soc_codec *codec)
 {
        return jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_OFF);
 }

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 9b6036e5738aeecea68598644d68afa75d4edb89..ba4f6f167a1304444a5e3c1b4eea4705fe30bffd 100644 (file)
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -1946,7 +1946,7 @@ static void max98088_handle_pdata(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int max98088_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int max98088_suspend(struct snd_soc_codec *codec)
 {
        max98088_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 01f4ad725149e68845beba7f6acc3a1ab75715bc..c69dd022bea887335e55818e921926864f4e4fd9 100644 (file)
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -2174,7 +2174,7 @@ static void max98095_handle_pdata(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int max98095_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int max98095_suspend(struct snd_soc_codec *codec)
 {
        max98095_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index 94c2b586ed5dbf12a645384c7d8e55470416acae..7dfd6e84796d339fddce5d586012c68d9c108911 100644 (file)
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -273,7 +273,7 @@ static struct snd_soc_dai_driver max9850_dai = {
 };
 
 #ifdef CONFIG_PM
-static int max9850_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int max9850_suspend(struct snd_soc_codec *codec)
 {
        max9850_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index b12d01f67990a5591a6700b01b75d535b0382145..edcaa7ea548757b3825acb27a1af9fd958d9121b 100644 (file)
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -118,7 +118,7 @@ static int pcm3008_soc_remove(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int pcm3008_soc_suspend(struct snd_soc_codec *codec, pm_message_t msg)
+static int pcm3008_soc_suspend(struct snd_soc_codec *codec)
 {
        struct pcm3008_setup_data *setup = codec->dev->platform_data;
 

diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index 9fd50bd77c491bdf28b10270b1429358932b41a9..f6e4f5ed9286891167b957197464b0c8ad3a51a2 100644 (file)
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1641,7 +1641,7 @@ static int rt5631_remove(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int rt5631_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int rt5631_suspend(struct snd_soc_codec *codec)
 {
        rt5631_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index ff0a1079efec278a6edadd518b8e8f8d8743528d..250175755eb280ef2d7f63829bd4e6c90375d9d1 100644 (file)
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -967,7 +967,7 @@ static int sgtl5000_volatile_register(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_SUSPEND
-static int sgtl5000_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int sgtl5000_suspend(struct snd_soc_codec *codec)
 {
        sgtl5000_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 0d43e4b4a5868475004f0dac39dd30edc23e09e0..7dfc7b08114c3c1b41aaff73412ad50f69a0a290 100644 (file)
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -523,7 +523,7 @@ static struct snd_soc_dai_driver ssm2602_dai = {
        .ops = &ssm2602_dai_ops,
 };
 
-static int ssm2602_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int ssm2602_suspend(struct snd_soc_codec *codec)
 {
        ssm2602_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index b3d1c78e361f4cc47320db29b72947b09456416d..6648af6656c8469b67dab098502be136651ea0e0 100644 (file)
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -801,7 +801,7 @@ static struct snd_soc_dai_driver sta32x_dai = {
 };
 
 #ifdef CONFIG_PM
-static int sta32x_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int sta32x_suspend(struct snd_soc_codec *codec)
 {
        sta32x_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 55819537b6776c0f3cc9569c9337cb43a97d86b1..e34969cdc0e8d0db0a2e90b3839371b781e6f617 100644 (file)
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -256,8 +256,7 @@ static int stac9766_reset(struct snd_soc_codec *codec, int try_warm)
        return 0;
 }
 
-static int stac9766_codec_suspend(struct snd_soc_codec *codec,
-                                 pm_message_t state)
+static int stac9766_codec_suspend(struct snd_soc_codec *codec)
 {
        stac9766_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index cba798e1a07e92071f2d44f8d3ca0b97d61f574d..60d08aeac22aec87fc50ce204ab3d60fcd860b28 100644 (file)
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -528,8 +528,7 @@ static struct snd_soc_dai_driver tlv320aic23_dai = {
        .ops = &tlv320aic23_dai_ops,
 };
 
-static int tlv320aic23_suspend(struct snd_soc_codec *codec,
-                              pm_message_t state)
+static int tlv320aic23_suspend(struct snd_soc_codec *codec)
 {
        tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index f553375673792c359a8883e77e0a6040e6e12c4b..81a26e1090b31d00e76a1e1dd486c96620ac8506 100644 (file)
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -621,7 +621,7 @@ static struct snd_soc_dai_driver aic32x4_dai = {
        .symmetric_rates = 1,
 };
 
-static int aic32x4_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int aic32x4_suspend(struct snd_soc_codec *codec)
 {
        aic32x4_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 21625dddde23a41c95d1742c0cffc61aa9d1c5b9..6f963c50e76eec26dd530b91ce2c015abf5cd2d1 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1268,7 +1268,7 @@ static struct snd_soc_dai_driver aic3x_dai = {
        .symmetric_rates = 1,
 };
 
-static int aic3x_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int aic3x_suspend(struct snd_soc_codec *codec)
 {
        aic3x_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 6b0f0e220f85466ac1334f4483cdcd73e676c3f1..c7a61fbdae4bef13549ffa7a7b3bda495878c277 100644 (file)
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1460,7 +1460,7 @@ static int dac33_soc_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static int dac33_soc_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int dac33_soc_suspend(struct snd_soc_codec *codec)
 {
        dac33_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 61d8a9065ff3cb8f779e8aa1be9c9cd3f47ea3b1..18e71014cc2e87a93d82abdca853b62d29ab8a54 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -2202,7 +2202,7 @@ static struct snd_soc_dai_driver twl4030_dai[] = {
 },
 };
 
-static int twl4030_soc_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int twl4030_soc_suspend(struct snd_soc_codec *codec)
 {
        twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index a4a65dc9e33afaa69fe85d1a26d3f6b60fd035d5..3376e6fad2a2813f0f490785cfec710f7ceeb7f4 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1470,7 +1470,7 @@ static struct snd_soc_dai_driver twl6040_dai[] = {
 };
 
 #ifdef CONFIG_PM
-static int twl6040_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int twl6040_suspend(struct snd_soc_codec *codec)
 {
        twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index d0f9d904ce8f8420161166a981f8767d886f553e..8f4f469d64115cb52ae8c58fd60fcc78d9669e50 100644 (file)
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -571,8 +571,7 @@ static int uda134x_soc_remove(struct snd_soc_codec *codec)
 }
 
 #if defined(CONFIG_PM)
-static int uda134x_soc_suspend(struct snd_soc_codec *codec,
-                                               pm_message_t state)
+static int uda134x_soc_suspend(struct snd_soc_codec *codec)
 {
        uda134x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
        uda134x_set_bias_level(codec, SND_SOC_BIAS_OFF);

diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 6b933efc7ed3bfbe6c1d1e012e26caa4aca02261..d08b91dde53d20f1502cfc619066567b50d7f714 100644 (file)
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -705,7 +705,7 @@ static struct snd_soc_dai_driver uda1380_dai[] = {
 },
 };
 
-static int uda1380_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int uda1380_suspend(struct snd_soc_codec *codec)
 {
        uda1380_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 3f1ed5f5ccf4208a147606f60bb9b66e0ac42c41..f39497fc13e09c14cc98c975d433cd7ae780d22d 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1315,7 +1315,7 @@ static int wm8350_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-static int wm8350_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8350_suspend(struct snd_soc_codec *codec)
 {
        wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index a1173eb7936d46071d0c82bf93ff50961165532e..56a7b7256efac60ba1e9b67c4f8241dc9829b185 100644 (file)
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1352,7 +1352,7 @@ static struct snd_soc_dai_driver wm8400_dai = {
        .ops = &wm8400_dai_ops,
 };
 
-static int wm8400_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8400_suspend(struct snd_soc_codec *codec)
 {
        wm8400_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index 3a655719ba2c40e16098f03559b059e96ec98da5..5e847506138e68b3a809ca23a239433a08010aa3 100644 (file)
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -534,7 +534,7 @@ static struct snd_soc_dai_driver wm8510_dai = {
        .symmetric_rates = 1,
 };
 
-static int wm8510_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8510_suspend(struct snd_soc_codec *codec)
 {
        wm8510_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 0c89f8e2daafe9692e18545c48b119747b556173..7fea2c3bf7e77dbf16096709df41004cf88ffdbf 100644 (file)
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -384,7 +384,7 @@ static struct snd_soc_dai_driver wm8523_dai = {
 };
 
 #ifdef CONFIG_PM
-static int wm8523_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8523_suspend(struct snd_soc_codec *codec)
 {
        wm8523_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 760080e43015859e38aaa672b62aded1031f0bdd..b9b1a2f8360fe1cf8054ba45f6fda7fd76463d43 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -338,7 +338,7 @@ static struct snd_soc_dai_driver wm8711_dai = {
        .ops = &wm8711_ops,
 };
 
-static int wm8711_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8711_suspend(struct snd_soc_codec *codec)
 {
        snd_soc_write(codec, WM8711_ACTIVE, 0x0);
        wm8711_set_bias_level(codec, SND_SOC_BIAS_OFF);

diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 085c2f81d8c2635952d97b85524664c3f047e73d..b1f01d9273be91499b663ee28860e16f457e9342 100644 (file)
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -214,7 +214,7 @@ static struct snd_soc_dai_driver wm8728_dai = {
        .ops = &wm8728_dai_ops,
 };
 
-static int wm8728_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8728_suspend(struct snd_soc_codec *codec)
 {
        wm8728_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index c18dee06f29c12f1e49cd8eddb369ab816e57f4e..8821af70e660b354e4672a5aa7c32fa5fd7fd3f9 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -490,7 +490,7 @@ static struct snd_soc_dai_driver wm8731_dai = {
 };
 
 #ifdef CONFIG_PM
-static int wm8731_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8731_suspend(struct snd_soc_codec *codec)
 {
        wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
index c13e4f7809cfd17632e34bd56d5a44a6a2f41d99..ff95e62c56b9a7ae211c3f2d508d9cff94132931 100644 (file)
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
@@ -539,7 +539,7 @@ static struct snd_soc_dai_driver wm8737_dai = {
 };
 
 #ifdef CONFIG_PM
-static int wm8737_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8737_suspend(struct snd_soc_codec *codec)
 {
        wm8737_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index b312fccbf67a0a4befb4cb2b84080ba43b8d6364..48cb78fd0103f66d6b804882fab78754810d29c0 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -666,7 +666,7 @@ static struct snd_soc_dai_driver wm8750_dai = {
        .ops = &wm8750_dai_ops,
 };
 
-static int wm8750_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8750_suspend(struct snd_soc_codec *codec)
 {
        wm8750_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index dc3153852d8a476478330fc2c7552399699343c1..b114c19f530ab89c30ea9daa24cc2a0eef143f85 100644 (file)
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1380,7 +1380,7 @@ static void wm8753_work(struct work_struct *work)
        wm8753_set_bias_level(codec, dapm->bias_level);
 }
 
-static int wm8753_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8753_suspend(struct snd_soc_codec *codec)
 {
        wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c
index 391c385ec43ef1eda839b9b5d7d511ceca28b236..8976eb5796d3ec057617524719cd8b05e2aec793 100644 (file)
--- a/sound/soc/codecs/wm8770.c
+++ b/sound/soc/codecs/wm8770.c
@@ -555,7 +555,7 @@ static struct snd_soc_dai_driver wm8770_dai = {
 };
 
 #ifdef CONFIG_PM
-static int wm8770_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8770_suspend(struct snd_soc_codec *codec)
 {
        wm8770_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index af542a2f5941410a6b6168c6e96038ba1aec30bc..fbf80c5220d02a799bce1c1e8bdf5f4fda818493 100644 (file)
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -371,7 +371,7 @@ static struct snd_soc_dai_driver wm8776_dai[] = {
 };
 
 #ifdef CONFIG_PM
-static int wm8776_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8776_suspend(struct snd_soc_codec *codec)
 {
        wm8776_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index d99c6a0a0a2d9b5dbee79a170a00d941fe3d627b..ae4b8fb3c3e5da4c22cbcb46e68c8b22b34b9fc6 100644 (file)
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -542,7 +542,7 @@ static int wm8804_set_bias_level(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_PM
-static int wm8804_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8804_suspend(struct snd_soc_codec *codec)
 {
        wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 6ac80cf80b31388cf53868862fb8ac7bb51ca1de..85632ffcb8722dff72151b122decddb2b6540e00 100644 (file)
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1106,7 +1106,7 @@ static int wm8900_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-static int wm8900_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8900_suspend(struct snd_soc_codec *codec)
 {
        struct wm8900_priv *wm8900 = snd_soc_codec_get_drvdata(codec);
        int fll_out = wm8900->fll_out;

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 70a2268c5498c31f62cd3d30e5ed07dc2dcff29b..d663c97785d776684d38bfa89f56ebbb5ff3ee9a 100644 (file)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1758,7 +1758,7 @@ static struct snd_soc_dai_driver wm8903_dai = {
        .symmetric_rates = 1,
 };
 
-static int wm8903_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8903_suspend(struct snd_soc_codec *codec)
 {
        wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index babca49c87664a78b17e0efb614fdccb03ea59eb..f0ae01bbaa94ea51399518d7c40c85a876f32ed9 100644 (file)
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2234,7 +2234,7 @@ static struct snd_soc_dai_driver wm8904_dai = {
 };
 
 #ifdef CONFIG_PM
-static int wm8904_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8904_suspend(struct snd_soc_codec *codec)
 {
        wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 9f1cce8d105dde94468024da48aaf9b3986e6967..0fe4545eef8977c0ad552f4208ecdbfc74c53f58 100644 (file)
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -672,7 +672,7 @@ static struct snd_soc_dai_driver wm8940_dai = {
        .symmetric_rates = 1,
 };
 
-static int wm8940_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8940_suspend(struct snd_soc_codec *codec)
 {
        return wm8940_set_bias_level(codec, SND_SOC_BIAS_OFF);
 }

diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index ca38722bc3fe50a33a046aad5ad845f742054dea..cdd51398e1f424a764e9391e8f88332e9f324120 100644 (file)
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -878,7 +878,7 @@ static struct snd_soc_dai_driver wm8955_dai = {
 };
 
 #ifdef CONFIG_PM
-static int wm8955_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8955_suspend(struct snd_soc_codec *codec)
 {
        wm8955_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index ed2773f623ca65b990ce0213b3f10307cfb59529..55b9a25cd1b382abc9e44c2010df21f3f56cd12b 100644 (file)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -894,7 +894,7 @@ static struct snd_soc_dai_driver wm8960_dai = {
        .symmetric_rates = 1,
 };
 
-static int wm8960_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8960_suspend(struct snd_soc_codec *codec)
 {
        struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
 

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index c0587013fdfa28a452aa241363d98abc54bebfe2..9bcf846e93b0a7cd00078b7bf4e8bf9199131d6a 100644 (file)
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -1038,7 +1038,7 @@ static int wm8961_remove(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int wm8961_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8961_suspend(struct snd_soc_codec *codec)
 {
        wm8961_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index b01df56b824a53b86fdfa0044a5dd300c6ff3457..aadd14a146615ef84ea0a30b09e6967d66b18913 100644 (file)
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -599,7 +599,7 @@ static void wm8971_work(struct work_struct *work)
        wm8971_set_bias_level(codec, codec->dapm.bias_level);
 }
 
-static int wm8971_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8971_suspend(struct snd_soc_codec *codec)
 {
        wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index e41f9993c6528eb1508a8a28c5e5b4b1cf8c0f16..a5fd017c43324bee8672de93008336d0ea4f7855 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -582,7 +582,7 @@ static struct snd_soc_dai_driver wm8974_dai = {
        .symmetric_rates = 1,
 };
 
-static int wm8974_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8974_suspend(struct snd_soc_codec *codec)
 {
        wm8974_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index 649a2e3c02ae5f450b0b1baac3086947cd30fc98..85d514d63a4c8862e9be6f7c4a751f1aa749a6ab 100644 (file)
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -892,7 +892,7 @@ static struct snd_soc_dai_driver wm8978_dai = {
        .ops = &wm8978_dai_ops,
 };
 
-static int wm8978_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8978_suspend(struct snd_soc_codec *codec)
 {
        wm8978_set_bias_level(codec, SND_SOC_BIAS_OFF);
        /* Also switch PLL off */

diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index 362298cce92c5f7619c5ff465f5aaf9e48e92e59..cebde568d1919a0e961601b1e308be8ebb1accc8 100644 (file)
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -974,7 +974,7 @@ static int wm8983_set_bias_level(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_PM
-static int wm8983_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8983_suspend(struct snd_soc_codec *codec)
 {
        wm8983_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index 9e4481bb122322d51052158d7324e4acc1e2a888..c0c86b3c6adf69076be221308d0fe0fcc48a1c08 100644 (file)
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -945,7 +945,7 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_PM
-static int wm8985_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8985_suspend(struct snd_soc_codec *codec)
 {
        wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 608c6721e4f15c5245502afa790981d19b56cb49..093884705b0151aa6f6a25ecad24d570fdd806d0 100644 (file)
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -728,7 +728,7 @@ static struct snd_soc_dai_driver wm8988_dai = {
        .symmetric_rates = 1,
 };
 
-static int wm8988_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8988_suspend(struct snd_soc_codec *codec)
 {
        wm8988_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 58d7f0bff99036d014b5e8d58ec658d2318eb68c..b417d2e0cdfd5402e17d203721f422941c35bd70 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1313,7 +1313,7 @@ static struct snd_soc_dai_driver wm8990_dai = {
        .ops = &wm8990_dai_ops,
 };
 
-static int wm8990_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8990_suspend(struct snd_soc_codec *codec)
 {
        wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index 35c5389e5ef73b3bda94a1ec4530511063afdc11..7ee40da8dbb52021db9427ec84f7b2751236b7d5 100644 (file)
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -1240,7 +1240,7 @@ static int wm8991_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-static int wm8991_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8991_suspend(struct snd_soc_codec *codec)
 {
        wm8991_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 780c24cdab6de6d989c91a9a0f6a3701cf3b56e0..0f8278b4f0ad5a68289f2f739694e7a61a0229cd 100644 (file)
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1544,7 +1544,7 @@ static int wm8993_remove(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int wm8993_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8993_suspend(struct snd_soc_codec *codec)
 {
        struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
        int fll_fout = wm8993->fll_fout;

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 0699ed2fb7936c655114af7be3624a44a6bf6eb4..d9faa39d826d1972758b6c5eab6bec44f2dd6d90 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2801,7 +2801,7 @@ static struct snd_soc_dai_driver wm8994_dai[] = {
 };
 
 #ifdef CONFIG_PM
-static int wm8994_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8994_suspend(struct snd_soc_codec *codec)
 {
        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
        struct wm8994 *control = wm8994->wm8994;

diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 8f6a36d7c75be67bd3db55c01dc934d66b5b18fc..5863406b459d95408f55beb9f9c7591764fa1097 100644 (file)
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -2009,7 +2009,7 @@ static int wm8995_set_bias_level(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_PM
-static int wm8995_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8995_suspend(struct snd_soc_codec *codec)
 {
        wm8995_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 8a4b970604444e5140d5017447ee81bdd6036294..1f2672b1e03e9267062ca42835aeea785db7c151 100644 (file)
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1302,7 +1302,7 @@ static int wm9081_remove(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int wm9081_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm9081_suspend(struct snd_soc_codec *codec)
 {
        wm9081_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
index f94c06057c64c31ac6e4bd70fbf80799cc52837d..5cb8759868df0663a9ef81741fb2579f42b1f3da 100644 (file)
--- a/sound/soc/codecs/wm9090.c
+++ b/sound/soc/codecs/wm9090.c
@@ -604,7 +604,7 @@ static int wm9090_probe(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int wm9090_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm9090_suspend(struct snd_soc_codec *codec)
 {
        wm9090_set_bias_level(codec, SND_SOC_BIAS_OFF);
 

diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index b720a43c422c1935017baa8e5a198a01522af059..40c92ead85a34526e4ce5d49c09e43595b8ae6c1 100644 (file)
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -306,7 +306,7 @@ static int wm9705_reset(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int wm9705_soc_suspend(struct snd_soc_codec *codec, pm_message_t msg)
+static int wm9705_soc_suspend(struct snd_soc_codec *codec)
 {
        soc_ac97_ops.write(codec->ac97, AC97_POWERDOWN, 0xffff);
 

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 4ce73f59df2071336862e07a9b467fdc40d1fa1f..b7b31f84c10b579432591d7d7caff670b1b6d9b7 100644 (file)
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -583,8 +583,7 @@ err:
        return -EIO;
 }
 
-static int wm9712_soc_suspend(struct snd_soc_codec *codec,
-       pm_message_t state)
+static int wm9712_soc_suspend(struct snd_soc_codec *codec)
 {
        wm9712_set_bias_level(codec, SND_SOC_BIAS_OFF);
        return 0;

diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index edb598182c696d1a930970b34b9ad81b71616713..2b8479bfcd93b822c48daa1f4e6797cf679d8cec 100644 (file)
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1140,8 +1140,7 @@ static int wm9713_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-static int wm9713_soc_suspend(struct snd_soc_codec *codec,
-       pm_message_t state)
+static int wm9713_soc_suspend(struct snd_soc_codec *codec)
 {
        u16 reg;
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ec783f0a27e9d00925ceb494c1864aa34c4b2ff9..5195f0653b35323d39edd80e3cfd52801a700177 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -572,7 +572,7 @@ int snd_soc_suspend(struct device *dev)
                        switch (codec->dapm.bias_level) {
                        case SND_SOC_BIAS_STANDBY:
                        case SND_SOC_BIAS_OFF:
-                               codec->driver->suspend(codec, PMSG_SUSPEND);
+                               codec->driver->suspend(codec);
                                codec->suspended = 1;
                                codec->cache_sync = 1;
                                break;