Merge series "ASoC: tegra: Fix compile warning with CONFIG_PM=n" from Takashi Iwai <tiwai@suse.de>:
Hi, this is a trivial patch set to add the missing __maybe_unused for covering the compile warnings with CONFIG_PM=n. Takashi === Takashi Iwai (5): ASoC: tegra: tegra186_dspk: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_admaif: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_ahub: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_dmic: Fix compile warning with CONFIG_PM=n ASoC: tegra: tegra210_i2s: Fix compile warning with CONFIG_PM=n sound/soc/tegra/tegra186_dspk.c | 4 ++-- sound/soc/tegra/tegra210_admaif.c | 4 ++-- sound/soc/tegra/tegra210_ahub.c | 4 ++-- sound/soc/tegra/tegra210_dmic.c | 4 ++-- sound/soc/tegra/tegra210_i2s.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) -- 2.16.4
This commit is contained in:
commit
58ff5f4db1
@ -71,7 +71,7 @@ static int tegra186_dspk_put_control(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tegra186_dspk_runtime_suspend(struct device *dev)
|
||||
static int __maybe_unused tegra186_dspk_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct tegra186_dspk *dspk = dev_get_drvdata(dev);
|
||||
|
||||
@ -83,7 +83,7 @@ static int tegra186_dspk_runtime_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tegra186_dspk_runtime_resume(struct device *dev)
|
||||
static int __maybe_unused tegra186_dspk_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct tegra186_dspk *dspk = dev_get_drvdata(dev);
|
||||
int err;
|
||||
|
@ -219,7 +219,7 @@ static const struct regmap_config tegra186_admaif_regmap_config = {
|
||||
.cache_type = REGCACHE_FLAT,
|
||||
};
|
||||
|
||||
static int tegra_admaif_runtime_suspend(struct device *dev)
|
||||
static int __maybe_unused tegra_admaif_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct tegra_admaif *admaif = dev_get_drvdata(dev);
|
||||
|
||||
@ -229,7 +229,7 @@ static int tegra_admaif_runtime_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tegra_admaif_runtime_resume(struct device *dev)
|
||||
static int __maybe_unused tegra_admaif_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct tegra_admaif *admaif = dev_get_drvdata(dev);
|
||||
|
||||
|
@ -564,7 +564,7 @@ static const struct of_device_id tegra_ahub_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, tegra_ahub_of_match);
|
||||
|
||||
static int tegra_ahub_runtime_suspend(struct device *dev)
|
||||
static int __maybe_unused tegra_ahub_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct tegra_ahub *ahub = dev_get_drvdata(dev);
|
||||
|
||||
@ -576,7 +576,7 @@ static int tegra_ahub_runtime_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tegra_ahub_runtime_resume(struct device *dev)
|
||||
static int __maybe_unused tegra_ahub_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct tegra_ahub *ahub = dev_get_drvdata(dev);
|
||||
int err;
|
||||
|
@ -40,7 +40,7 @@ static const struct reg_default tegra210_dmic_reg_defaults[] = {
|
||||
{ TEGRA210_DMIC_LP_BIQUAD_1_COEF_4, 0x0 },
|
||||
};
|
||||
|
||||
static int tegra210_dmic_runtime_suspend(struct device *dev)
|
||||
static int __maybe_unused tegra210_dmic_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct tegra210_dmic *dmic = dev_get_drvdata(dev);
|
||||
|
||||
@ -52,7 +52,7 @@ static int tegra210_dmic_runtime_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tegra210_dmic_runtime_resume(struct device *dev)
|
||||
static int __maybe_unused tegra210_dmic_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct tegra210_dmic *dmic = dev_get_drvdata(dev);
|
||||
int err;
|
||||
|
@ -164,7 +164,7 @@ static int tegra210_i2s_init(struct snd_soc_dapm_widget *w,
|
||||
return tegra210_i2s_sw_reset(compnt, is_playback);
|
||||
}
|
||||
|
||||
static int tegra210_i2s_runtime_suspend(struct device *dev)
|
||||
static int __maybe_unused tegra210_i2s_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct tegra210_i2s *i2s = dev_get_drvdata(dev);
|
||||
|
||||
@ -176,7 +176,7 @@ static int tegra210_i2s_runtime_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tegra210_i2s_runtime_resume(struct device *dev)
|
||||
static int __maybe_unused tegra210_i2s_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct tegra210_i2s *i2s = dev_get_drvdata(dev);
|
||||
int err;
|
||||
|
Loading…
Reference in New Issue
Block a user