---

yaml --- r: 259805 b: refs/heads/master c: e327ec2 h: refs/heads/master i: 259803: f3b3aca v: v3
git-mirror · Jul 5, 2011 · b43482a · b43482a
1 parent 79c0432
commit b43482a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 165 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3e47e074e4dd9e2fe630e74cf1e146fb192a8af
+refs/heads/master: e327ec2300d4b2ebe1731bd37dcc4a67d8da9975
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -30,7 +30,6 @@ DHDOFILES = \
 	wl_cfg80211.o \
 	dhd_cdc.o \
 	dhd_common.o \
-	dhd_custom_gpio.o \
 	dhd_sdio.o	\
 	dhd_linux.o \
 	bcmsdh.o \

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -2192,8 +2192,6 @@ static void __exit brcmf_module_cleanup(void)
 #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
 	wifi_del_dev();
 #endif
-	/* Call customer gpio to turn off power with WL_REG_ON signal */
-	brcmf_customer_gpio_wlan_ctrl(WLAN_POWER_OFF);
 }
 
 static int __init brcmf_module_init(void)
@@ -2216,8 +2214,6 @@ static int __init brcmf_module_init(void)
 		DHD_ERROR(("Invalid module parameters.\n"));
 		return -EINVAL;
 	} while (0);
-	/* Call customer gpio to turn on power with WL_REG_ON signal */
-	brcmf_customer_gpio_wlan_ctrl(WLAN_POWER_ON);
 
 #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
 	sema_init(&wifi_control_sem, 0);
@@ -2245,11 +2241,9 @@ static int __init brcmf_module_init(void)
 		DHD_ERROR(("%s: dhd_bus_register failed\n", __func__));
 		goto failed;
 	}
-	return error;
+	return 0;
 
 failed:
-	/* turn off power and exit */
-	brcmf_customer_gpio_wlan_ctrl(WLAN_POWER_OFF);
 	return -EINVAL;
 }