summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-15 14:08:48 +0100
committerMark Brown <broonie@kernel.org>2015-01-06 18:54:09 +0100
commitfcf6c5ea7abd42cfc2dde0ff0451b209951de9b4 (patch)
tree219355847491da5b56f43d4f4fd4006b4ac291b4 /sound/soc
parentASoC: dapm: Simplify fully route card handling (diff)
downloadlinux-fcf6c5ea7abd42cfc2dde0ff0451b209951de9b4.tar.xz
linux-fcf6c5ea7abd42cfc2dde0ff0451b209951de9b4.zip
ASoC: dapm: Don't use async I/O
The only user of the async I/O support in ASoC is SPI which was using it to avoid needless context thrashing and minimise controller runtime PM bounces. The SPI framework has now been enhanced so that even normal spi_sync() calls won't suffer these effects so we don't need to handle this in ASoC and in fact it can be more efficient not to since we don't need to set up and tear down the buffers needed to manage asynchronous I/O. The async completions that DAPM does are left in place so drivers can use them, they are very cheap if there is no asynchronous work queued. Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index ea496842ee83..0be3ca52eff3 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -517,8 +517,8 @@ static int soc_dapm_update_bits(struct snd_soc_dapm_context *dapm,
{
if (!dapm->component)
return -EIO;
- return snd_soc_component_update_bits_async(dapm->component, reg,
- mask, value);
+ return snd_soc_component_update_bits(dapm->component, reg,
+ mask, value);
}
static int soc_dapm_test_bits(struct snd_soc_dapm_context *dapm,