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

Unverified Commit 44275d26 authored by Diep Quynh's avatar Diep Quynh Committed by synt4x93
Browse files

drivers: mpsd: fix clang errors 



- Switch from global_page_state to global_node_page_state (thanks to
  erfranoabdi for the idea)
- Relocate static definition

Signed-off-by: default avatarDiep Quynh <remilia.1505@gmail.com>
Change-Id: I6c77acd7e797d4033584dd780a79c15aebfe997c
parent b0efa729

drivers/mpsd/mpsd.c

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ static atomic_t is_mpsd_enabled = ATOMIC_INIT(0); 
static atomic_t wakeup_user = ATOMIC_INIT(0);

static atomic_t suspend = ATOMIC_INIT(0);



static struct mpsd_device mpsd_dev;

static DECLARE_WAIT_QUEUE_HEAD(queue_wait);



/**
@@ -56,6 +55,8 @@ struct mpsd_device { 
	unsigned int behavior;

};



static struct mpsd_device mpsd_dev;



bool get_mpsd_flag(void)

{

	return (bool)atomic_read(&is_mpsd_enabled);

drivers/mpsd/mpsd_read.c

+10 −10
Original line number Diff line number Diff line
@@ -3086,7 +3086,7 @@ static void get_dev_mem_avail(struct dev_params_struct *data) 
	si_meminfo(&meminfo);



	for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++)

		pages[lru] = global_page_state(NR_LRU_BASE + lru);

		pages[lru] = global_node_page_state(NR_LRU_BASE + lru);



	for_each_zone(zone)

		wmark_low += zone->watermark[WMARK_LOW];
@@ -3150,7 +3150,7 @@ static void get_dev_mem_cached(struct dev_params_struct *data) 


	si_meminfo(&meminfo);



	cached = global_page_state(NR_FILE_PAGES) - total_swapcache_pages()

	cached = global_node_page_state(NR_FILE_PAGES) - total_swapcache_pages()

		- meminfo.bufferram;

	if (cached < 0)

		cached = 0;
@@ -3243,7 +3243,7 @@ static void get_dev_mem_dirty(struct dev_params_struct *data) 
	}



	data->mem_dirty =

		(long long)global_page_state(NR_FILE_DIRTY);

		(long long)global_node_page_state(NR_FILE_DIRTY);

}



/**
@@ -3264,7 +3264,7 @@ static void get_dev_mem_anon_pages(struct dev_params_struct *data) 
	}



	data->mem_anon_pages =

		(long long)global_page_state(NR_ANON_MAPPED);

		(long long)global_node_page_state(NR_ANON_MAPPED);

}



/**
@@ -3285,7 +3285,7 @@ static void get_dev_mem_mapped(struct dev_params_struct *data) 
	}



	data->mem_mapped =

		(long long)global_page_state(NR_FILE_MAPPED);

		(long long)global_node_page_state(NR_FILE_MAPPED);

}



/**
@@ -3514,7 +3514,7 @@ static void get_dev_mem_params(struct dev_params_struct *dev_params) 
	dev_params->mem_swap_free = (long long)meminfo.freeswap;



	for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++)

		pages[lru] = global_page_state(NR_LRU_BASE + lru);

		pages[lru] = global_node_page_state(NR_LRU_BASE + lru);



	for_each_zone(zone)

		wmark_low += zone->watermark[WMARK_LOW];
@@ -3530,7 +3530,7 @@ static void get_dev_mem_params(struct dev_params_struct *dev_params) 


	dev_params->mem_avail = (long long)available;



	cached = global_page_state(NR_FILE_PAGES) - total_swapcache_pages()

	cached = global_node_page_state(NR_FILE_PAGES) - total_swapcache_pages()

		- meminfo.bufferram;

	if (cached < 0)

		cached = 0;
@@ -3538,10 +3538,10 @@ static void get_dev_mem_params(struct dev_params_struct *dev_params) 
	dev_params->mem_cached = (long long)cached;



	dev_params->mem_swap_cached = (long long)total_swapcache_pages();

	dev_params->mem_dirty = (long long)global_page_state(NR_FILE_DIRTY);

	dev_params->mem_dirty = (long long)global_node_page_state(NR_FILE_DIRTY);

	dev_params->mem_anon_pages =

		(long long)global_page_state(NR_ANON_MAPPED);

	dev_params->mem_mapped = (long long)global_page_state(NR_FILE_MAPPED);

		(long long)global_node_page_state(NR_ANON_MAPPED);

	dev_params->mem_mapped = (long long)global_node_page_state(NR_FILE_MAPPED);

	dev_params->mem_sysheap = -1;

	dev_params->mem_sysheap_pool = -1;

	dev_params->mem_vmalloc_api = DEFAULT_PARAM_VAL_INT;