All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: broonie@kernel.org, lgirdwood@gmail.com
Cc: alsa-devel@alsa-project.org, jsarha@ti.com
Subject: [PATCH 2/4] ASoC: davinci-mcasp: Change __davinci_mcasp_set_clkdiv() first parameter
Date: Mon, 9 May 2016 13:42:30 +0300	[thread overview]
Message-ID: <1462790552-6438-3-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1462790552-6438-1-git-send-email-peter.ujfalusi@ti.com>

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>
---
 sound/soc/davinci/davinci-mcasp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 836f694e4b9d..47be74d74384 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -540,11 +540,9 @@ out:
 	return ret;
 }
 
-static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,
+static int __davinci_mcasp_set_clkdiv(struct davinci_mcasp *mcasp, int div_id,
 				      int div, bool explicit)
 {
-	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
-
 	pm_runtime_get_sync(mcasp->dev);
 	switch (div_id) {
 	case MCASP_CLKDIV_AUXCLK:			/* MCLK divider */
@@ -592,7 +590,9 @@ static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,
 static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,
 				    int div)
 {
-	return __davinci_mcasp_set_clkdiv(dai, div_id, div, 1);
+	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
+
+	return __davinci_mcasp_set_clkdiv(mcasp, div_id, div, 1);
 }
 
 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,
 			dev_info(mcasp->dev, "Sample-rate is off by %d PPM\n",
 				 ppm);
 
-		__davinci_mcasp_set_clkdiv(cpu_dai, 1, div, 0);
+		__davinci_mcasp_set_clkdiv(mcasp, 1, div, 0);
 	}
 
 	ret = mcasp_common_hw_param(mcasp, substream->stream,
-- 
2.8.2

  parent reply	other threads:[~2016-05-09 10:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-09 10:42 [PATCH 0/4] ASoC: davinci-mcasp: Master mode clock divider correction Peter Ujfalusi
2016-05-09 10:42 ` [PATCH 1/4] ASoC: davinci-mcasp: Use defines for clkdiv IDs Peter Ujfalusi
2016-05-10 18:49   ` Applied "ASoC: davinci-mcasp: Use defines for clkdiv IDs" to the asoc tree Mark Brown
2016-05-09 10:42 ` Peter Ujfalusi [this message]
2016-05-10 18:49   ` Applied "ASoC: davinci-mcasp: Change __davinci_mcasp_set_clkdiv() first parameter" " Mark Brown
2016-05-09 10:42 ` [PATCH 3/4] ASoC: davinci-mcasp: Restructure the davinci_mcasp_calc_clk_div() Peter Ujfalusi
2016-05-10 18:49   ` Applied "ASoC: davinci-mcasp: Restructure the davinci_mcasp_calc_clk_div()" to the asoc tree Mark Brown
2016-05-09 10:42 ` [PATCH 4/4] ASoC: davinci-mcasp: Calculate AUXCLK divider when setting up master clocks Peter Ujfalusi
2016-05-10 18:49   ` Applied "ASoC: davinci-mcasp: Calculate AUXCLK divider when setting up master clocks" to the asoc tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1462790552-6438-3-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jsarha@ti.com \
    --cc=lgirdwood@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.