revert the wifi power control of commit cb6f8a8f312c9ee1420a1b1afeb4b550b958f1ac

diff --git a/drivers/net/wireless/rkusbwifi/wifi_power.c b/drivers/net/wireless/rkusbwifi/wifi_power.c
index 2ebcd4b9b872cf5a7329b3b3046362d87347edae..a0dd91b7ad5af810838d9942c365b44b4db4fa36 100755 (executable)
--- a/drivers/net/wireless/rkusbwifi/wifi_power.c
+++ b/drivers/net/wireless/rkusbwifi/wifi_power.c
@@ -39,16 +39,11 @@ EXPORT_SYMBOL(init_channel_plan);
  */
 struct wifi_power power_gpio = 
 {
-       #if defined(CONFIG_MACH_RK2926_V86)
-        POWER_USE_GPIO, 0,
-        0, 0, RK2928_PIN0_PD3, GPIO_LOW
-        #else
        POWER_NOT_USE_GPIO, 0, 0, 0, 0, 0 
 
        // RBOX
        //POWER_USE_GPIO, POWER_GPIO_IOMUX, 
        //GPIO5D6_SDMMC1PWREN_NAME, GPIO5H_GPIO5D6, RK29_PIN5_PD6, GPIO_HIGH 
-        #endif
 };
 
 /*

diff --git a/drivers/net/wireless/rkusbwifi/wifi_power_ops.c b/drivers/net/wireless/rkusbwifi/wifi_power_ops.c
index 12b32eca9491601f745a7ae0bb1c7048c94cf735..2c289e92665ab4e71add5de14b42165fb3f2e4b8 100644 (file)
--- a/drivers/net/wireless/rkusbwifi/wifi_power_ops.c
+++ b/drivers/net/wireless/rkusbwifi/wifi_power_ops.c
@@ -77,13 +77,7 @@ int wifi_gpio_operate(struct wifi_power *gpio, int flag)
  */\r
 int wifi_turn_on_rtl8192c_card(void)\r
 {\r
-        #if defined(CONFIG_MACH_RK2926_V86)\r
-        wifi_gpio_operate(&power_gpio, GPIO_SWITCH_ON);\r
-        //rk29sdk_wifi_power(1);\r
-        #else\r
-        //wifi_gpio_operate(&power_gpio, GPIO_SWITCH_ON);\r
-        rk29sdk_wifi_power(1);\r
-        #endif\r
+       //wifi_gpio_operate(&power_gpio, GPIO_SWITCH_ON);\r
         rk29sdk_wifi_power(1);\r
        if (power_gpio.use_gpio != POWER_NOT_USE_GPIO)\r
                msleep(1000);\r
@@ -102,13 +96,8 @@ int wifi_turn_on_card(int module)
 \r
 int wifi_turn_off_card(void)\r
 {\r
-        #if defined(CONFIG_MACH_RK2926_V86)\r
-        wifi_gpio_operate(&power_gpio, GPIO_SWITCH_OFF);\r
-        //rk29sdk_wifi_power(0);\r
-        #else\r
-       //wifi_gpio_operate(&power_gpio, GPIO_SWITCH_OFF);\r
+       //wifi_gpio_operate(&power_gpio, GPIO_SWITCH_OFF);\r
         rk29sdk_wifi_power(0);\r
-        #endif\r
        msleep(5);\r
 \r
        wifi_turn_off_callback();\r