From: Albert Cano <a.canocamps@samsung.com>
Date: Fri, 24 Aug 2018 06:57:35 +0000 (+0100)
Subject: [9610] wlbt: Fix compilation error
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0105d51bea4a35847e5e55c31cef679b79e35bea;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[9610] wlbt: Fix compilation error

Fix compilation error when CONFIG_SCSC_LOG_COLLECTION
is no selected

Change-Id: I329a2985ad16a71d500bb80d512a1c40020635bb
SCSC-Bug-Id: SSB-43116
Signed-off-by: Albert Cano <a.canocamps@samsung.com>
---

diff --git a/drivers/misc/samsung/scsc/mxman.c b/drivers/misc/samsung/scsc/mxman.c
index a6c827e89e3b..8d26ddeec29c 100755
--- a/drivers/misc/samsung/scsc/mxman.c
+++ b/drivers/misc/samsung/scsc/mxman.c
@@ -935,10 +935,10 @@ static int mxman_start(struct mxman *mxman)
 		SCSC_TAG_INFO(MXMAN, "HW reset deassertion failed\n");
 
 		/* Save log at point of failure */
-#ifdef CONFIG_SCSC_MX_LOG_DUMP
-		mx140_log_dump();
-#elif CONFIG_SCSC_LOG_COLLECTION
+#ifdef CONFIG_SCSC_LOG_COLLECTION
 		scsc_log_collector_schedule_collection(SCSC_LOG_HOST_COMMON, SCSC_LOG_HOST_COMMON_REASON_START);
+#else
+		mx140_log_dump();
 #endif
 	}
 	if (fwhdr_parsed_ok) {
@@ -1590,10 +1590,10 @@ static void mxman_stop(struct mxman *mxman)
 		reset_failed = true;
 
 		/* Save log at point of failure */
-#ifdef CONFIG_SCSC_MX_LOG_DUMP
-		mx140_log_dump();
-#elif CONFIG_SCSC_LOG_COLLECTION
+#ifdef CONFIG_SCSC_LOG_COLLECTION
 		scsc_log_collector_schedule_collection(SCSC_LOG_HOST_COMMON, SCSC_LOG_HOST_COMMON_REASON_STOP);
+#else
+		mx140_log_dump();
 #endif
 	}
 
diff --git a/drivers/misc/samsung/scsc/platform_mif.c b/drivers/misc/samsung/scsc/platform_mif.c
index 30da4fe20c4b..5008149337e5 100755
--- a/drivers/misc/samsung/scsc/platform_mif.c
+++ b/drivers/misc/samsung/scsc/platform_mif.c
@@ -1210,10 +1210,10 @@ done:
 		SCSC_TAG_ERR_DEV(PLAT_MIF, platform->dev, "Reset not recovered");
 
 	/* Save log at point of failure, last to show recovery attempt */
-#ifdef CONFIG_SCSC_MX_LOG_DUMP
-	mx140_log_dump();
-#elif CONFIG_SCSC_LOG_COLLECTION
+#ifdef CONFIG_SCSC_LOG_COLLECTION
 	scsc_log_collector_schedule_collection(SCSC_LOG_HOST_COMMON, SCSC_LOG_HOST_COMMON_RECOVER_RST);
+#else
+	mx140_log_dump();
 #endif
 	return ret;
 }
diff --git a/drivers/net/wireless/scsc/ioctl.c b/drivers/net/wireless/scsc/ioctl.c
index d0b18dd0be56..2db3b9ee9ca0 100755
--- a/drivers/net/wireless/scsc/ioctl.c
+++ b/drivers/net/wireless/scsc/ioctl.c
@@ -2453,10 +2453,10 @@ int slsi_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 #ifndef SLSI_TEST_DEV
 	} else if (strncasecmp(command, CMD_DRIVERDEBUGDUMP, strlen(CMD_DRIVERDEBUGDUMP)) == 0) {
 		slsi_dump_stats(dev);
-#ifdef CONFIG_SCSC_MX_LOG_DUMP
-		ret = mx140_log_dump();
-#elif CONFIG_SCSC_LOG_COLLECTION
+#ifdef CONFIG_SCSC_LOG_COLLECTION
 		scsc_log_collector_schedule_collection(SCSC_LOG_HOST_WLAN, SCSC_LOG_HOST_WLAN_REASON_DRIVERDEBUGDUMP);
+#else
+		ret = mx140_log_dump();
 #endif
 #endif
 	} else {
diff --git a/drivers/net/wireless/scsc/mlme.c b/drivers/net/wireless/scsc/mlme.c
index 0ef241a0423a..c2b1feb65f13 100755
--- a/drivers/net/wireless/scsc/mlme.c
+++ b/drivers/net/wireless/scsc/mlme.c
@@ -2305,10 +2305,10 @@ int slsi_mlme_disconnect(struct slsi_dev *sdev, struct net_device *dev, u8 *mac,
 
 	SLSI_NET_DBG1(dev, SLSI_MLME, "mlme_disconnect_req(vif:%u, bssid:%pM, reason:%d)\n", ndev_vif->ifnum, mac, reason_code);
 
-#ifdef CONFIG_SCSC_MX_LOG_DUMP
-	mx140_log_dump();
-#elif CONFIG_SCSC_LOG_COLLECTION
+#ifdef CONFIG_SCSC_LOG_COLLECTION
 	scsc_log_collector_schedule_collection(SCSC_LOG_HOST_WLAN, SCSC_LOG_HOST_WLAN_REASON_DISCONNECT);
+#else
+	mx140_log_dump();
 #endif
 	/* No data reference required */
 	req = fapi_alloc(mlme_disconnect_req, MLME_DISCONNECT_REQ, ndev_vif->ifnum, 0);
diff --git a/drivers/net/wireless/scsc/rx.c b/drivers/net/wireless/scsc/rx.c
index 7acda06252e9..c9b4ee2fdba8 100755
--- a/drivers/net/wireless/scsc/rx.c
+++ b/drivers/net/wireless/scsc/rx.c
@@ -1552,10 +1552,10 @@ void slsi_rx_disconnect_ind(struct slsi_dev *sdev, struct net_device *dev, struc
 		      fapi_get_vif(skb),
 		      fapi_get_buff(skb, u.mlme_disconnect_ind.peer_sta_address));
 
-#ifdef CONFIG_SCSC_MX_LOG_DUMP
-	mx140_log_dump();
-#elif CONFIG_SCSC_LOG_COLLECTION
+#ifdef CONFIG_SCSC_LOG_COLLECTION
 	scsc_log_collector_schedule_collection(SCSC_LOG_HOST_WLAN, SCSC_LOG_HOST_WLAN_REASON_DISCONNECT_IND);
+#else
+	mx140_log_dump();
 #endif
 	slsi_handle_disconnect(sdev,
 			       dev,
@@ -1577,10 +1577,10 @@ void slsi_rx_disconnected_ind(struct slsi_dev *sdev, struct net_device *dev, str
 		      fapi_get_u16(skb, u.mlme_disconnected_ind.reason_code),
 		      fapi_get_buff(skb, u.mlme_disconnected_ind.peer_sta_address));
 
-#ifdef CONFIG_SCSC_MX_LOG_DUMP
-	mx140_log_dump();
-#elif CONFIG_SCSC_LOG_COLLECTION
+#ifdef CONFIG_SCSC_LOG_COLLECTION
 	scsc_log_collector_schedule_collection(SCSC_LOG_HOST_WLAN, SCSC_LOG_HOST_WLAN_REASON_DISCONNECTED_IND);
+#else
+	mx140_log_dump();
 #endif
 	if (ndev_vif->vif_type == FAPI_VIFTYPE_AP) {
 		if (fapi_get_u16(skb, u.mlme_disconnected_ind.reason_code) ==