Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67011009 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents fb205d55 397a6472

drivers/net/wireless/cnss_prealloc/cnss_prealloc.c

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ void wcnss_prealloc_check_memory_leak(void) 
#else

void wcnss_prealloc_check_memory_leak(void) {}

#endif

EXPORT_SYMBOL(wcnss_prealloc_check_memory_leak);



int wcnss_pre_alloc_reset(void)

{
@@ -225,6 +226,7 @@ int wcnss_pre_alloc_reset(void) 


	return n;

}

EXPORT_SYMBOL(wcnss_pre_alloc_reset);



static int __init wcnss_pre_alloc_init(void)

{

drivers/soc/qcom/icnss.c

+0 −13
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ 
#include <soc/qcom/socinfo.h>

#include <soc/qcom/ramdump.h>



#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC

#include <net/cnss_prealloc.h>

#endif





#include "wlan_firmware_service_v01.h"



#ifdef CONFIG_ICNSS_DEBUG
@@ -1968,8 +1963,6 @@ static int icnss_call_driver_probe(struct icnss_priv *priv) 
	if (ret < 0) {

		icnss_pr_err("Driver probe failed: %d, state: 0x%lx\n",

			     ret, priv->state);

		wcnss_prealloc_check_memory_leak();

		wcnss_pre_alloc_reset();

		goto out;

	}
@@ -2099,8 +2092,6 @@ static int icnss_driver_event_register_driver(void *data) 
	if (ret) {

		icnss_pr_err("Driver probe failed: %d, state: 0x%lx\n",

			     ret, penv->state);

		wcnss_prealloc_check_memory_leak();

		wcnss_pre_alloc_reset();

		goto power_off;

	}
@@ -2126,8 +2117,6 @@ static int icnss_driver_event_unregister_driver(void *data) 
		penv->ops->remove(&penv->pdev->dev);



	clear_bit(ICNSS_DRIVER_PROBED, &penv->state);

	wcnss_prealloc_check_memory_leak();

	wcnss_pre_alloc_reset();



	penv->ops = NULL;
@@ -2152,8 +2141,6 @@ static int icnss_call_driver_remove(struct icnss_priv *priv) 
	penv->ops->remove(&priv->pdev->dev);



	clear_bit(ICNSS_DRIVER_PROBED, &priv->state);

	wcnss_prealloc_check_memory_leak();

	wcnss_pre_alloc_reset();



	icnss_hw_power_off(penv);