From e1f30bbdddce7f3408cc2854ba51b05efdd91865 Mon Sep 17 00:00:00 2001
From: Jason Liu <jason.hui.liu@nxp.com>
Date: Fri, 14 Dec 2018 15:02:27 +0800
Subject: [PATCH] MLK-20589 sound:soc:codecs:ak4458: Don't mixed declarations
 and code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The patch fixes the following build warnings:

sound/soc/codecs/ak4458.c: In function ‘ak4458_hw_params’:
warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
  u8 dfs1, dfs2;
 ^~~

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
CC: Shengjiu Wang <shengjiu.wang@nxp.com>
Acked-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 sound/soc/codecs/ak4458.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/ak4458.c b/sound/soc/codecs/ak4458.c
index 6cb4aa28ef6524..6d1d19eeb2e930 100644
--- a/sound/soc/codecs/ak4458.c
+++ b/sound/soc/codecs/ak4458.c
@@ -656,14 +656,14 @@ static int ak4458_hw_params(struct snd_pcm_substream *substream,
 	int ret, dsd_bclk, channels, channels_max;
 	bool is_dsd = false;
 
-	channels = params_channels(params);
-	channels_max = dai->driver->playback.channels_max;
-
 #ifdef AK4458_ACKS_USE_MANUAL_MODE
 	u8 dfs1, dfs2;
 #endif
 	int nfs1;
 
+	channels = params_channels(params);
+	channels_max = dai->driver->playback.channels_max;
+
 	dev_dbg(dai->dev, "%s(%d)\n", __func__, __LINE__);
 
 	switch (params_format(params)) {
-- 
GitLab