diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-04-25 12:22:20 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-04-25 12:22:20 +0200 |
commit | 3a230f7d09dd0f0eec90bc94abc440ab740c86f1 (patch) | |
tree | 882e7922b62bf925872ef1beac993307df39d137 /sound/soc/sh | |
parent | 65811834ba56e9ed88117cf6c09880416c9951ab (diff) | |
parent | a8419a0cd98ddf628a9e38a92110af7cc650dde7 (diff) | |
download | linux-3a230f7d09dd0f0eec90bc94abc440ab740c86f1.tar.bz2 |
Merge tag 'asoc-fix-4.17-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.17
A small batch of fixes collected since the merge window, none of which
are particularly large or remarkable. They've all been cooking in -next
for a while.
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/rcar/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 6a76688a8ba9..94f081b93258 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1536,7 +1536,7 @@ static int rsnd_remove(struct platform_device *pdev) return ret; } -static int rsnd_suspend(struct device *dev) +static int __maybe_unused rsnd_suspend(struct device *dev) { struct rsnd_priv *priv = dev_get_drvdata(dev); @@ -1545,7 +1545,7 @@ static int rsnd_suspend(struct device *dev) return 0; } -static int rsnd_resume(struct device *dev) +static int __maybe_unused rsnd_resume(struct device *dev) { struct rsnd_priv *priv = dev_get_drvdata(dev); |