PD#117660: wifi: wifi power code clean up

Change-Id: I4d76cabcc00b8e24dee0a8aac65711ae046ae8b4

diff --git a/bcmdhd_1_201_59_x/Makefile b/bcmdhd_1_201_59_x/Makefile
index c29a6490989bba3c84e61ce1749988a37ce9b576..3d098615007d5203a9f5a82456be9ee55f2cd611 100644 (file)
--- a/bcmdhd_1_201_59_x/Makefile
+++ b/bcmdhd_1_201_59_x/Makefile
@@ -68,6 +68,7 @@ endif
 ifeq ($(CONFIG_DHD_USE_STATIC_BUF),y)
 # add dhd_static_buf to kernel image build
 #obj-y += dhd_static_buf.o
+DHDCFLAGS += -DCONFIG_DHD_USE_STATIC_BUF
 DHDCFLAGS += -DSTATIC_WL_PRIV_STRUCT -DENHANCED_STATIC_BUF
 endif
 

diff --git a/bcmdhd_1_201_59_x/dhd_linux.c b/bcmdhd_1_201_59_x/dhd_linux.c
index 8e08ce8b839b560c00574f5e48b324e6111302f1..8b0c4f7472dede66febbfff0c76d7e84160b758c 100644 (file)
--- a/bcmdhd_1_201_59_x/dhd_linux.c
+++ b/bcmdhd_1_201_59_x/dhd_linux.c
@@ -7606,7 +7606,9 @@ dhd_module_cleanup(void)
 
        dhd_wifi_platform_unregister_drv();
 #ifdef CUSTOMER_HW_AMLOGIC
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
        wifi_teardown_dt();
+#endif
 #endif
        printf("%s: Exit\n", __FUNCTION__);
 }
@@ -7626,9 +7628,11 @@ dhd_module_init(void)
 
        printf("%s: in\n", __FUNCTION__);
 #ifdef CUSTOMER_HW_AMLOGIC
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
        if (wifi_setup_dt()) {
                printf("wifi_dt : fail to setup dt\n");
        }
+#endif
 #endif
 
        DHD_PERIM_RADIO_INIT();
@@ -7661,7 +7665,9 @@ dhd_module_init(void)
 
        if (err) {
 #ifdef CUSTOMER_HW_AMLOGIC
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
                wifi_teardown_dt();
+#endif
 #endif
                DHD_ERROR(("%s: Failed to load driver max retry reached**\n", __FUNCTION__));
        }