Skip to content

Commit

Permalink
ASoC: Drop unused state parameter from CODEC suspend callback
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Dec 2, 2011
1 parent 36c6b54 commit 84b315e
Show file tree
Hide file tree
Showing 67 changed files with 67 additions and 73 deletions.
3 changes: 1 addition & 2 deletions include/sound/soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ac97.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ad1836.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/adau1373.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/adav80x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4535.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ak4641.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/alc5623.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/alc5632.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs4271.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/cs42l73.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/jz4740.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/max98088.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/max98095.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/max9850.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/pcm3008.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/rt5631.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/sgtl5000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/ssm2602.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/sta32x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions sound/soc/codecs/stac9766.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions sound/soc/codecs/tlv320aic23.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/tlv320aic32x4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/tlv320aic3x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/tlv320dac33.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/twl4030.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/twl6040.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 1 addition & 2 deletions sound/soc/codecs/uda134x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/uda1380.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8350.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8400.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8510.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8523.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8711.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8728.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8731.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8737.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8750.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8753.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8770.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8776.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8804.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8900.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 84b315e

Please sign in to comment.