Skip to content

Commit 58ff5f4

Browse files
committed
Merge series "ASoC: tegra: Fix compile warning with CONFIG_PM=n" from Takashi Iwai <[email protected]>:
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
2 parents 9493755 + 823279c commit 58ff5f4

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

sound/soc/tegra/tegra186_dspk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static int tegra186_dspk_put_control(struct snd_kcontrol *kcontrol,
7171
return 0;
7272
}
7373

74-
static int tegra186_dspk_runtime_suspend(struct device *dev)
74+
static int __maybe_unused tegra186_dspk_runtime_suspend(struct device *dev)
7575
{
7676
struct tegra186_dspk *dspk = dev_get_drvdata(dev);
7777

@@ -83,7 +83,7 @@ static int tegra186_dspk_runtime_suspend(struct device *dev)
8383
return 0;
8484
}
8585

86-
static int tegra186_dspk_runtime_resume(struct device *dev)
86+
static int __maybe_unused tegra186_dspk_runtime_resume(struct device *dev)
8787
{
8888
struct tegra186_dspk *dspk = dev_get_drvdata(dev);
8989
int err;

sound/soc/tegra/tegra210_admaif.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static const struct regmap_config tegra186_admaif_regmap_config = {
219219
.cache_type = REGCACHE_FLAT,
220220
};
221221

222-
static int tegra_admaif_runtime_suspend(struct device *dev)
222+
static int __maybe_unused tegra_admaif_runtime_suspend(struct device *dev)
223223
{
224224
struct tegra_admaif *admaif = dev_get_drvdata(dev);
225225

@@ -229,7 +229,7 @@ static int tegra_admaif_runtime_suspend(struct device *dev)
229229
return 0;
230230
}
231231

232-
static int tegra_admaif_runtime_resume(struct device *dev)
232+
static int __maybe_unused tegra_admaif_runtime_resume(struct device *dev)
233233
{
234234
struct tegra_admaif *admaif = dev_get_drvdata(dev);
235235

sound/soc/tegra/tegra210_ahub.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ static const struct of_device_id tegra_ahub_of_match[] = {
564564
};
565565
MODULE_DEVICE_TABLE(of, tegra_ahub_of_match);
566566

567-
static int tegra_ahub_runtime_suspend(struct device *dev)
567+
static int __maybe_unused tegra_ahub_runtime_suspend(struct device *dev)
568568
{
569569
struct tegra_ahub *ahub = dev_get_drvdata(dev);
570570

@@ -576,7 +576,7 @@ static int tegra_ahub_runtime_suspend(struct device *dev)
576576
return 0;
577577
}
578578

579-
static int tegra_ahub_runtime_resume(struct device *dev)
579+
static int __maybe_unused tegra_ahub_runtime_resume(struct device *dev)
580580
{
581581
struct tegra_ahub *ahub = dev_get_drvdata(dev);
582582
int err;

sound/soc/tegra/tegra210_dmic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static const struct reg_default tegra210_dmic_reg_defaults[] = {
4040
{ TEGRA210_DMIC_LP_BIQUAD_1_COEF_4, 0x0 },
4141
};
4242

43-
static int tegra210_dmic_runtime_suspend(struct device *dev)
43+
static int __maybe_unused tegra210_dmic_runtime_suspend(struct device *dev)
4444
{
4545
struct tegra210_dmic *dmic = dev_get_drvdata(dev);
4646

@@ -52,7 +52,7 @@ static int tegra210_dmic_runtime_suspend(struct device *dev)
5252
return 0;
5353
}
5454

55-
static int tegra210_dmic_runtime_resume(struct device *dev)
55+
static int __maybe_unused tegra210_dmic_runtime_resume(struct device *dev)
5656
{
5757
struct tegra210_dmic *dmic = dev_get_drvdata(dev);
5858
int err;

sound/soc/tegra/tegra210_i2s.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static int tegra210_i2s_init(struct snd_soc_dapm_widget *w,
164164
return tegra210_i2s_sw_reset(compnt, is_playback);
165165
}
166166

167-
static int tegra210_i2s_runtime_suspend(struct device *dev)
167+
static int __maybe_unused tegra210_i2s_runtime_suspend(struct device *dev)
168168
{
169169
struct tegra210_i2s *i2s = dev_get_drvdata(dev);
170170

@@ -176,7 +176,7 @@ static int tegra210_i2s_runtime_suspend(struct device *dev)
176176
return 0;
177177
}
178178

179-
static int tegra210_i2s_runtime_resume(struct device *dev)
179+
static int __maybe_unused tegra210_i2s_runtime_resume(struct device *dev)
180180
{
181181
struct tegra210_i2s *i2s = dev_get_drvdata(dev);
182182
int err;

0 commit comments

Comments
 (0)