]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: nau8822: move nau8822_set_dai_sysclk()
authorAndrejs Cainikovs <andrejs.cainikovs@toradex.com>
Thu, 13 Jun 2024 08:46:50 +0000 (10:46 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 18 Jun 2024 15:45:44 +0000 (16:45 +0100)
Next commit in series makes a change which calls nau8822_set_pll() from
nau8822_set_dai_sysclk(). Moving latter after the former would avoid a
forward declaration, and this is exactly what this change does.

Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
Link: https://msgid.link/r/20240613084652.13113-2-andrejs.cainikovs@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/nau8822.c

index e6909e64dfa39d6d5e44e44e909c122c4b148d7a..a6741bda6a9e7a5640ea1e5199340db2ea90dc8f 100644 (file)
@@ -612,20 +612,6 @@ static const struct snd_soc_dapm_route nau8822_dapm_routes[] = {
        {"Right DAC", NULL, "Digital Loopback"},
 };
 
-static int nau8822_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
-                                unsigned int freq, int dir)
-{
-       struct snd_soc_component *component = dai->component;
-       struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
-
-       nau8822->div_id = clk_id;
-       nau8822->sysclk = freq;
-       dev_dbg(component->dev, "master sysclk %dHz, source %s\n", freq,
-               clk_id == NAU8822_CLK_PLL ? "PLL" : "MCLK");
-
-       return 0;
-}
-
 static int nau8822_calc_pll(unsigned int pll_in, unsigned int fs,
                                struct nau8822_pll *pll_param)
 {
@@ -782,6 +768,20 @@ static int nau8822_set_pll(struct snd_soc_dai *dai, int pll_id, int source,
        return 0;
 }
 
+static int nau8822_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
+                                unsigned int freq, int dir)
+{
+       struct snd_soc_component *component = dai->component;
+       struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
+
+       nau8822->div_id = clk_id;
+       nau8822->sysclk = freq;
+       dev_dbg(component->dev, "master sysclk %dHz, source %s\n", freq,
+               clk_id == NAU8822_CLK_PLL ? "PLL" : "MCLK");
+
+       return 0;
+}
+
 static int nau8822_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
        struct snd_soc_component *component = dai->component;