From 320599c660f86006dcab7851686ee81dc85d568a Mon Sep 17 00:00:00 2001
From: Jianxin Pan <jianxin.pan@amlogic.com>
Date: Tue, 14 Mar 2017 16:58:08 +0800
Subject: [PATCH] compiler: fix gcc6 compilation error

PD#138714: gcc-6 warns about obviously wrong indentation

Change-Id: I41ecc671536c8083d13c4da00e09ddbe5f7c59c1
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
---
 drivers/amlogic/media/video_sink/video.c      |  6 ++--
 .../vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c     | 36 +++++++++----------
 drivers/amlogic/mmc/amlsd.c                   |  2 +-
 scripts/amlogic/mk_dtb.sh                     |  3 +-
 scripts/amlogic/mk_gx.sh                      |  2 +-
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c
index cde0c02f9eb4..387285e3e8cf 100644
--- a/drivers/amlogic/media/video_sink/video.c
+++ b/drivers/amlogic/media/video_sink/video.c
@@ -5828,15 +5828,15 @@ static u32 yuv2rgb(u32 yuv)
 	r = r - 16;
 	if (r < 0)
 		r = 0;
-		r = r*1164/1000;
+	r = r*1164/1000;
 	g = g - 16;
 	if (g < 0)
 		g = 0;
-		g = g*1164/1000;
+	g = g*1164/1000;
 	b = b - 16;
 	if (b < 0)
 		b = 0;
-		b = b*1164/1000;
+	b = b*1164/1000;
 
 	r = (r <= 0) ? 0 : (r >= 255) ? 255 : r;
 	g = (g <= 0) ? 0 : (g >= 255) ? 255 : g;
diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
index ddfbb955b779..8c1b521af59b 100644
--- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
+++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c
@@ -448,8 +448,8 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._AC3._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._AC3._32k = 1;
-				info->tv_audio_info._AC3._max_bit =
-					Data[i+2];
+			info->tv_audio_info._AC3._max_bit =
+				Data[i+2];
 			break;
 		case 3:
 			info->tv_audio_info._MPEG1.support_flag = 1;
@@ -469,8 +469,8 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._MPEG1._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._MPEG1._32k = 1;
-				info->tv_audio_info._MPEG1._max_bit =
-					Data[i+2];
+			info->tv_audio_info._MPEG1._max_bit =
+				Data[i+2];
 			break;
 		case 4:
 			info->tv_audio_info._MP3.support_flag = 1;
@@ -490,7 +490,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._MP3._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._MP3._32k = 1;
-				info->tv_audio_info._MP3._max_bit = Data[i+2];
+			info->tv_audio_info._MP3._max_bit = Data[i+2];
 			break;
 		case 5:
 			info->tv_audio_info._MPEG2.support_flag = 1;
@@ -510,7 +510,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._MPEG2._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._MPEG2._32k = 1;
-				info->tv_audio_info._MPEG2._max_bit = Data[i+2];
+			info->tv_audio_info._MPEG2._max_bit = Data[i+2];
 			break;
 		case 6:
 			info->tv_audio_info._AAC.support_flag = 1;
@@ -530,7 +530,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._AAC._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._AAC._32k = 1;
-				info->tv_audio_info._AAC._max_bit = Data[i+2];
+			info->tv_audio_info._AAC._max_bit = Data[i+2];
 			break;
 		case 7:
 			info->tv_audio_info._DTS.support_flag = 1;
@@ -550,7 +550,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._DTS._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._DTS._32k = 1;
-				info->tv_audio_info._DTS._max_bit = Data[i+2];
+			info->tv_audio_info._DTS._max_bit = Data[i+2];
 			break;
 		case 8:
 			info->tv_audio_info._ATRAC.support_flag = 1;
@@ -570,7 +570,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._ATRAC._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._ATRAC._32k = 1;
-				info->tv_audio_info._ATRAC._max_bit = Data[i+2];
+			info->tv_audio_info._ATRAC._max_bit = Data[i+2];
 			break;
 		case 9:
 			info->tv_audio_info._One_Bit_Audio.support_flag = 1;
@@ -590,8 +590,8 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._One_Bit_Audio._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._One_Bit_Audio._32k = 1;
-				info->tv_audio_info._One_Bit_Audio._max_bit =
-					Data[i+2];
+			info->tv_audio_info._One_Bit_Audio._max_bit =
+				Data[i+2];
 			break;
 		case 10:
 			info->tv_audio_info._Dolby.support_flag = 1;
@@ -611,7 +611,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._Dolby._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._Dolby._32k = 1;
-				info->tv_audio_info._Dolby._max_bit = Data[i+2];
+			info->tv_audio_info._Dolby._max_bit = Data[i+2];
 			break;
 
 		case 11:
@@ -632,8 +632,8 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._DTS_HD._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._DTS_HD._32k = 1;
-				info->tv_audio_info._DTS_HD._max_bit =
-					Data[i+2];
+			info->tv_audio_info._DTS_HD._max_bit =
+				Data[i+2];
 			break;
 		case 12:
 			info->tv_audio_info._MAT.support_flag = 1;
@@ -653,7 +653,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._MAT._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._MAT._32k = 1;
-				info->tv_audio_info._MAT._max_bit = Data[i+2];
+			info->tv_audio_info._MAT._max_bit = Data[i+2];
 			break;
 
 		case 13:
@@ -674,7 +674,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._DST._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._DST._32k = 1;
-				info->tv_audio_info._DST._max_bit = Data[i+2];
+			info->tv_audio_info._DST._max_bit = Data[i+2];
 			break;
 
 		case 14:
@@ -695,7 +695,7 @@ static void Edid_ParsingAudioDATABlock(struct hdmitx_info *info,
 				info->tv_audio_info._WMA._44k = 1;
 			if ((Data[i+1]&0x01))
 				info->tv_audio_info._WMA._32k = 1;
-				info->tv_audio_info._WMA._max_bit = Data[i+2];
+			info->tv_audio_info._WMA._max_bit = Data[i+2];
 			break;
 
 		default:
@@ -1079,7 +1079,7 @@ int Edid_ParsingCEADataBlockCollection(struct hdmitx_info *info,
 			if ((Addr + (Data&0x1f)) < D)
 				Edid_ParsingVideoDATABlock(info, buff,
 					Addr + 1, (Data & 0x1F));
-				break;
+			break;
 
 		case AUDIO_TAG:
 			len = (Data & 0x1f) + 1;
diff --git a/drivers/amlogic/mmc/amlsd.c b/drivers/amlogic/mmc/amlsd.c
index efc48449843e..77c3da545701 100644
--- a/drivers/amlogic/mmc/amlsd.c
+++ b/drivers/amlogic/mmc/amlsd.c
@@ -285,7 +285,7 @@ int aml_sd_voltage_switch(struct mmc_host *mmc, char signal_voltage)
 		|| (pdata->signal_voltage == signal_voltage)) {
 		if (aml_card_type_sdio(pdata))
 			host->sd_sdio_switch_volat_done = 1;
-			return 0;
+		return 0;
 	}
 	if (pdata->vol_switch) {
 		if (pdata->signal_voltage == 0xff) {
diff --git a/scripts/amlogic/mk_dtb.sh b/scripts/amlogic/mk_dtb.sh
index 0b134b2c783d..20b1d996ff3d 100755
--- a/scripts/amlogic/mk_dtb.sh
+++ b/scripts/amlogic/mk_dtb.sh
@@ -1,7 +1,6 @@
 #! /bin/bash
 
-export CROSS_COMPILE=/opt/gcc-linaro-5.3-2016.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
-
+export CROSS_COMPILE=/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
 
 make ARCH=arm64 gxm_q200_2g.dtb || echo "Compile dtb Fail !!"
 
diff --git a/scripts/amlogic/mk_gx.sh b/scripts/amlogic/mk_gx.sh
index c0086b027aee..bf1eef860d52 100755
--- a/scripts/amlogic/mk_gx.sh
+++ b/scripts/amlogic/mk_gx.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-export CROSS_COMPILE=/opt/gcc-linaro-5.3-2016.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
+export CROSS_COMPILE=/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
 
 make ARCH=arm64 meson64_defconfig
 make ARCH=arm64  -j8 Image  UIMAGE_LOADADDR=0x1080000 || echo "Compile Image Fail !!"