]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: stm32: sai: remove set but not used variables 'mask, cr1'
authorYueHaibing <yuehaibing@huawei.com>
Mon, 18 Feb 2019 14:50:26 +0000 (14:50 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 18 Feb 2019 18:23:59 +0000 (18:23 +0000)
Fixes gcc '-Wunused-but-set-variable' warning:

sound/soc/stm/stm32_sai_sub.c: In function 'stm32_sai_configure_clock':
sound/soc/stm/stm32_sai_sub.c:902:11: warning:
 variable 'mask' set but not used [-Wunused-but-set-variable]
sound/soc/stm/stm32_sai_sub.c:902:6: warning:
 variable 'cr1' set but not used [-Wunused-but-set-variable]

It's not used any more after 8307b2afd386 ("ASoC: stm32: sai: set sai as
mclk clock provider")

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/stm/stm32_sai_sub.c

index d4825700b63f66464938a7a8547414517cb8722e..f9297228c41ce4412f86d9ba7010ba714d44d345 100644 (file)
@@ -898,7 +898,7 @@ static int stm32_sai_configure_clock(struct snd_soc_dai *cpu_dai,
                                     struct snd_pcm_hw_params *params)
 {
        struct stm32_sai_sub_data *sai = snd_soc_dai_get_drvdata(cpu_dai);
-       int cr1, mask, div = 0;
+       int div = 0;
        int sai_clk_rate, mclk_ratio, den;
        unsigned int rate = params_rate(params);
 
@@ -943,10 +943,8 @@ static int stm32_sai_configure_clock(struct snd_soc_dai *cpu_dai,
                } else {
                        if (sai->mclk_rate) {
                                mclk_ratio = sai->mclk_rate / rate;
-                               if (mclk_ratio == 512) {
-                                       mask = SAI_XCR1_OSR;
-                                       cr1 = SAI_XCR1_OSR;
-                               } else if (mclk_ratio != 256) {
+                               if ((mclk_ratio != 512) &&
+                                   (mclk_ratio != 256)) {
                                        dev_err(cpu_dai->dev,
                                                "Wrong mclk ratio %d\n",
                                                mclk_ratio);