aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra/tegra_asoc_utils.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-04-19 17:25:09 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-20 08:49:55 -0400
commit075413966a6ea389f78f4cc2e957708c1d6db8c5 (patch)
tree7f67ad032800ff3469d772c214885778bf9e41d5 /sound/soc/tegra/tegra_asoc_utils.c
parentacb8303f15768c72796f3f95bb32a955333e0fbc (diff)
ASoC: Tegra: Don't return mclk_changed from utils_set_rate
Only the clock programming code needs to know whether the clocks changed, and that is encapsulated within tegra_asoc_utils_set_rate(). The machine driver's call to snd_soc_dai_set_sysclk(codec_dai, ...) is safe irrespective of whether the clocks changed. (Applying Mark's TrimSlice review comments to the existing driver) Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra/tegra_asoc_utils.c')
-rw-r--r--sound/soc/tegra/tegra_asoc_utils.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index 52f0a3f9ce40..dfa85cbb05c8 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -28,9 +28,10 @@
28#include "tegra_asoc_utils.h" 28#include "tegra_asoc_utils.h"
29 29
30int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate, 30int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate,
31 int mclk, int *mclk_change) 31 int mclk)
32{ 32{
33 int new_baseclock; 33 int new_baseclock;
34 bool clk_change;
34 int err; 35 int err;
35 36
36 switch (srate) { 37 switch (srate) {
@@ -52,10 +53,10 @@ int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate,
52 return -EINVAL; 53 return -EINVAL;
53 } 54 }
54 55
55 *mclk_change = ((new_baseclock != data->set_baseclock) || 56 clk_change = ((new_baseclock != data->set_baseclock) ||
56 (mclk != data->set_mclk)); 57 (mclk != data->set_mclk));
57 if (!*mclk_change) 58 if (!clk_change)
58 return 0; 59 return 0;
59 60
60 data->set_baseclock = 0; 61 data->set_baseclock = 0;
61 data->set_mclk = 0; 62 data->set_mclk = 0;