From: Glen Lee <glen.lee@atmel.com>
Date: Wed, 23 Sep 2015 07:10:52 +0000 (+0900)
Subject: staging: wilc1000: remove ifdef OLD_FPGA_BITFILE line
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f446ebbeee224cc50c6e8a04916585b8ac5dd566;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

staging: wilc1000: remove ifdef OLD_FPGA_BITFILE line

OLD_FPGA_BITFILE is not used in the driver. Just delete ifdef line and it's
related codes.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index ddb03a82b0f9..a3dd421b7f32 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1500,22 +1500,6 @@ static int wilc_wlan_start(void)
 	/**
 	 *      Set the host interface
 	 **/
-#ifdef OLD_FPGA_BITFILE
-	acquire_bus(ACQUIRE_ONLY);
-	ret = p->hif_func.hif_read_reg(WILC_VMM_CORE_CTL, &reg);
-	if (!ret) {
-		wilc_debug(N_ERR, "[wilc start]: fail read reg vmm_core_ctl...\n");
-		release_bus(RELEASE_ALLOW_SLEEP);
-		return ret;
-	}
-	reg |= (p->io_func.io_type << 2);
-	ret = p->hif_func.hif_write_reg(WILC_VMM_CORE_CTL, reg);
-	if (!ret) {
-		wilc_debug(N_ERR, "[wilc start]: fail write reg vmm_core_ctl...\n");
-		release_bus(RELEASE_ONLY);
-		return ret;
-	}
-#else
 	if (p->io_func.io_type == HIF_SDIO) {
 		reg = 0;
 		reg |= (1 << 3); /* bug 4456 and 4557 */
@@ -1572,8 +1556,6 @@ static int wilc_wlan_start(void)
 		ret = -5;
 		return ret;
 	}
-#endif
-
 
 	/**
 	 *      Bus related