From: lulu2 <lulu2@lenovo.com>
Date: Mon, 8 Jul 2019 04:50:06 +0000 (+0800)
Subject: pass Q build
X-Git-Tag: MMI-RSBS31.Q1-48-36-26~159
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5bc214a3d2a190f8f438d9737decc591ffa29921;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

pass Q build

Change-Id: Id843bf48ae346e4951fbffe6986b5ba272c9a1f2
---

diff --git a/AndroidKernel.mk b/AndroidKernel.mk
index 3464df718f5b..a385e13b554c 100644
--- a/AndroidKernel.mk
+++ b/AndroidKernel.mk
@@ -36,7 +36,7 @@ KERNEL_CROSS_COMPILE := $(CROSS_COMPILE)
 endif
 
 SOONG_GLOBAL_CONFIG := build/soong/cc/config/global.go
-CLANG_VERSION := $(shell  grep "ClangDefaultVersion" $(SOONG_GLOBAL_CONFIG) | grep -o "clang-[0-9][0-9]*")
+CLANG_VERSION := clang-4691093
 CLANG_PATH := prebuilts/clang/host/linux-x86
 CC :=$(PWD)/$(CLANG_PATH)/$(CLANG_VERSION)/bin/clang
 
diff --git a/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts b/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
index 17bf48bfef45..c032e7bc4f4e 100755
--- a/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-troika_evb.dts
@@ -12,7 +12,6 @@
 /dts-v1/;
 /plugin/;
 
-#include "exynos9610-troika-camera.dtsi"
 #include "exynos9610-troika-common.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
index dc6a2f6879cf..62e2ccab725e 100755
--- a/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos9610-pinctrl.dtsi
@@ -1226,13 +1226,6 @@
 			samsung,pin-drv = <2>;
 		};
 
-		fimc_is_mclk3_in: fimc_is_mclk3_in {
-			samsung,pins = "gpg3-5";
-			samsung,pin-function = <0>;
-			samsung,pin-pud = <0>;
-			samsung,pin-drv = <2>;
-		};
-
 		fimc_is_mclk0_out: fimc_is_mclk0_out {
 			samsung,pins = "gpc2-0";
 			samsung,pin-function = <1>;
@@ -1261,13 +1254,6 @@
 			samsung,pin-drv = <2>;
 		};
 
-		fimc_is_mclk3_out: fimc_is_mclk3_out {
-			samsung,pins = "gpg3-5";
-			samsung,pin-function = <1>;
-			samsung,pin-pud = <1>;
-			samsung,pin-drv = <2>;
-		};
-
 		fimc_is_mclk0_fn: fimc_is_mclk0_fn {
 			samsung,pins = "gpc2-0";
 			samsung,pin-function = <2>;
@@ -1296,13 +1282,6 @@
 			samsung,pin-drv = <2>;
 		};
 
-		fimc_is_mclk3_fn: fimc_is_mclk3_fn {
-			samsung,pins = "gpg3-5";
-			samsung,pin-function = <2>;
-			samsung,pin-pud = <0>;
-			samsung,pin-drv = <2>;
-		};
-
 		decon_f_te_on: decon_f_te_on {
 			samsung,pins = "gpc2-3";
 			samsung,pin-function = <0xf>;
diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c
index f4b7a71110ec..f39434638280 100755
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
@@ -294,9 +294,6 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
 	} else {
 		/* Assume 12 bit ADC with vref at pullup_uv */
 			uv = (pdata->pullup_uv * (s64)raw) >> 12;
-		}
-	} else {
-		uv = (pdata->pullup_uv * (s64)raw) >> 12;
 	}
 
 	return uv;
diff --git a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c
index 203c70ce04b6..bcc05155793c 100755
--- a/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c
+++ b/drivers/media/platform/exynos/fimc-is2/sensor/module_framework/fimc-is-interface-sensor.c
@@ -3518,19 +3518,6 @@ int set_sensor_info_mfhdr_mode_change(struct fimc_is_sensor_interface *itf,
 	return 0;
 }
 
-int request_wb_gain(struct fimc_is_sensor_interface *itf,
-		u32 gr_gain, u32 r_gain, u32 b_gain, u32 gb_gain)
-{
-	return 0;
-}
-
-int set_sensor_info_mfhdr_mode_change(struct fimc_is_sensor_interface *itf,
-		u32 count, u32 *long_expo, u32 *long_again, u32 *long_dgain,
-		u32 *expo, u32 *again, u32 *dgain)
-{
-	return 0;
-}
-
 int init_sensor_interface(struct fimc_is_sensor_interface *itf)
 {
 	int ret = 0;
diff --git a/drivers/video/fbdev/exynos/dpu20/dsim.h b/drivers/video/fbdev/exynos/dpu20/dsim.h
index 45d5c07ba590..d34c372f2048 100755
--- a/drivers/video/fbdev/exynos/dpu20/dsim.h
+++ b/drivers/video/fbdev/exynos/dpu20/dsim.h
@@ -249,7 +249,6 @@ struct dsim_device {
 	unsigned int ddi_seq_size;
 	unsigned char ddi_seq[512];
 	int user_brightness;
-	char ddi_device_type[DSIM_DDI_TYPE_LEN];
 };
 
 struct dsim_lcd_driver {
diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h
index de4a30aafef7..0f4502a2c929 100755
--- a/include/linux/platform_data/ntc_thermistor.h
+++ b/include/linux/platform_data/ntc_thermistor.h
@@ -57,7 +57,6 @@ struct ntc_thermistor_platform_data {
 	struct iio_channel *chan;
 	bool iio_convert_support;
 
-	bool iio_convert_support;
 	int (*read_ohm)(void);
 };