diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
| commit | 9db028827315550ea7e65898eebaf15d2456d830 (patch) | |
| tree | 4ba3067537cfd0d809fcac0396b2dab986c9930b /sound/soc/codecs/rt700-sdw.c | |
| parent | c7e661a1c2ae98a4754db6a85fc686b4a89322ad (diff) | |
| parent | 42b716359beca10684195fd6e93a74ecd8ca8003 (diff) | |
Merge tag 'asoc-v5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.6
A collection of updates for bugs fixed since the initial pull
request, the most important one being the addition of COMMON_CLK
for wcd934x which is needed for MFD to be merged.
Diffstat (limited to 'sound/soc/codecs/rt700-sdw.c')
| -rw-r--r-- | sound/soc/codecs/rt700-sdw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c index a4b95425886f..d4e0f953bcce 100644 --- a/sound/soc/codecs/rt700-sdw.c +++ b/sound/soc/codecs/rt700-sdw.c @@ -486,7 +486,7 @@ static const struct sdw_device_id rt700_id[] = { }; MODULE_DEVICE_TABLE(sdw, rt700_id); -static int rt700_dev_suspend(struct device *dev) +static int __maybe_unused rt700_dev_suspend(struct device *dev) { struct rt700_priv *rt700 = dev_get_drvdata(dev); @@ -500,7 +500,7 @@ static int rt700_dev_suspend(struct device *dev) #define RT700_PROBE_TIMEOUT 2000 -static int rt700_dev_resume(struct device *dev) +static int __maybe_unused rt700_dev_resume(struct device *dev) { struct sdw_slave *slave = dev_to_sdw_dev(dev); struct rt700_priv *rt700 = dev_get_drvdata(dev); |