diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-05-09 06:42:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-09 11:55:16 -0400 |
commit | 226e73e23b6b7f7d6df47562a7555ddb121163cf (patch) | |
tree | 5ddaa59bd8e6b1945f9853a31c5942ed9e771a63 | |
parent | 20d4b10730183a02851580f072bd9b0122873dc5 (diff) |
ASoC: davinci-mcasp: Change __davinci_mcasp_set_clkdiv() first parameter
Change the first parameter to struct davinci_mcasp* from
struct snd_soc_dai*
The function internally does not use or need the DAI information.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index adf1c3941f23..99061c4f3257 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
@@ -540,11 +540,9 @@ out: | |||
540 | return ret; | 540 | return ret; |
541 | } | 541 | } |
542 | 542 | ||
543 | static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, | 543 | static int __davinci_mcasp_set_clkdiv(struct davinci_mcasp *mcasp, int div_id, |
544 | int div, bool explicit) | 544 | int div, bool explicit) |
545 | { | 545 | { |
546 | struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai); | ||
547 | |||
548 | pm_runtime_get_sync(mcasp->dev); | 546 | pm_runtime_get_sync(mcasp->dev); |
549 | switch (div_id) { | 547 | switch (div_id) { |
550 | case MCASP_CLKDIV_AUXCLK: /* MCLK divider */ | 548 | case MCASP_CLKDIV_AUXCLK: /* MCLK divider */ |
@@ -592,7 +590,9 @@ static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, | |||
592 | static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, | 590 | static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, |
593 | int div) | 591 | int div) |
594 | { | 592 | { |
595 | return __davinci_mcasp_set_clkdiv(dai, div_id, div, 1); | 593 | struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai); |
594 | |||
595 | return __davinci_mcasp_set_clkdiv(mcasp, div_id, div, 1); | ||
596 | } | 596 | } |
597 | 597 | ||
598 | static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id, | 598 | static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id, |
@@ -1056,7 +1056,7 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, | |||
1056 | dev_info(mcasp->dev, "Sample-rate is off by %d PPM\n", | 1056 | dev_info(mcasp->dev, "Sample-rate is off by %d PPM\n", |
1057 | ppm); | 1057 | ppm); |
1058 | 1058 | ||
1059 | __davinci_mcasp_set_clkdiv(cpu_dai, 1, div, 0); | 1059 | __davinci_mcasp_set_clkdiv(mcasp, 1, div, 0); |
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | ret = mcasp_common_hw_param(mcasp, substream->stream, | 1062 | ret = mcasp_common_hw_param(mcasp, substream->stream, |