evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "icnss: remove pre-alloc memory leak check in platform driver"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-02 09:07:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit 34ca0e6f1d
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/cnss_prealloc/cnss_prealloc.c
View file

@ -228,6 +228,7 @@ void wcnss_prealloc_check_memory_leak(void)
#else #else
void wcnss_prealloc_check_memory_leak(void) {} void wcnss_prealloc_check_memory_leak(void) {}
#endif #endif
EXPORT_SYMBOL(wcnss_prealloc_check_memory_leak);
int wcnss_pre_alloc_reset(void) int wcnss_pre_alloc_reset(void)
{ {
@ -243,6 +244,7 @@ int wcnss_pre_alloc_reset(void)
return n; return n;
} }
EXPORT_SYMBOL(wcnss_pre_alloc_reset);
int prealloc_memory_stats_show(struct seq_file *fp, void *data) int prealloc_memory_stats_show(struct seq_file *fp, void *data)
{ {

13
drivers/soc/qcom/icnss.c
View file

@ -48,11 +48,6 @@
#include <soc/qcom/socinfo.h> #include <soc/qcom/socinfo.h>
#include <soc/qcom/ramdump.h> #include <soc/qcom/ramdump.h>
#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC
#include <net/cnss_prealloc.h>
#endif
#include "wlan_firmware_service_v01.h" #include "wlan_firmware_service_v01.h"
#ifdef CONFIG_ICNSS_DEBUG #ifdef CONFIG_ICNSS_DEBUG
@ -1969,8 +1964,6 @@ static int icnss_call_driver_probe(struct icnss_priv *priv)
if (ret < 0) { if (ret < 0) {
icnss_pr_err("Driver probe failed: %d, state: 0x%lx\n", icnss_pr_err("Driver probe failed: %d, state: 0x%lx\n",
ret, priv->state); ret, priv->state);
wcnss_prealloc_check_memory_leak();
wcnss_pre_alloc_reset();
goto out; goto out;
} }
@ -2105,8 +2098,6 @@ static int icnss_driver_event_register_driver(void *data)
if (ret) { if (ret) {
icnss_pr_err("Driver probe failed: %d, state: 0x%lx\n", icnss_pr_err("Driver probe failed: %d, state: 0x%lx\n",
ret, penv->state); ret, penv->state);
wcnss_prealloc_check_memory_leak();
wcnss_pre_alloc_reset();
goto power_off; goto power_off;
} }
@ -2131,8 +2122,6 @@ static int icnss_driver_event_unregister_driver(void *data)
penv->ops->remove(&penv->pdev->dev); penv->ops->remove(&penv->pdev->dev);
clear_bit(ICNSS_DRIVER_PROBED, &penv->state); clear_bit(ICNSS_DRIVER_PROBED, &penv->state);
wcnss_prealloc_check_memory_leak();
wcnss_pre_alloc_reset();
penv->ops = NULL; penv->ops = NULL;
@ -2157,8 +2146,6 @@ static int icnss_call_driver_remove(struct icnss_priv *priv)
penv->ops->remove(&priv->pdev->dev); penv->ops->remove(&priv->pdev->dev);
clear_bit(ICNSS_DRIVER_PROBED, &priv->state); clear_bit(ICNSS_DRIVER_PROBED, &priv->state);
wcnss_prealloc_check_memory_leak();
wcnss_pre_alloc_reset();
icnss_hw_power_off(penv); icnss_hw_power_off(penv);