Commit 84b315ee authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 36c6b54c

include/sound/soc.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */

sound/soc/codecs/ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/ad1836.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/codecs/adau1373.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

sound/soc/codecs/adav80x.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}