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

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

Merge "msm: smem: Rename smem_get_entry_to_proc() to smem_get_entry()"

parents bbd84486 b8624ba4

arch/arm/mach-msm/clock-pll.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ void __init msm_shared_pll_control_init(void) 


	remote_spin_lock_init(&pll_lock, PLL_REMOTE_SPINLOCK_ID);



	pll_control = smem_get_entry_to_proc(SMEM_CLKREGIM_SOURCES, &smem_size,

	pll_control = smem_get_entry(SMEM_CLKREGIM_SOURCES, &smem_size,

							0, SMEM_ANY_HOST_FLAG);

	if (!pll_control) {

		pr_err("Can't find shared PLL control data structure!\n");

arch/arm/mach-msm/include/mach/msm_smem.h

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void *smem_alloc(unsigned id, unsigned size_in, unsigned to_proc, 
								unsigned flags);

void *smem_find(unsigned id, unsigned size_in, unsigned to_proc,

								unsigned flags);

void *smem_get_entry_to_proc(unsigned id, unsigned *size, unsigned to_proc,

void *smem_get_entry(unsigned id, unsigned *size, unsigned to_proc,

								unsigned flags);



/**
@@ -208,8 +208,8 @@ static void *smem_find(unsigned id, unsigned size_in, unsigned to_proc, 
{

	return NULL;

}

static void *smem_get_entry_to_proc(unsigned id, unsigned *size,

					unsigned to_proc, unsigned flags)

static void *smem_get_entry(unsigned id, unsigned *size, unsigned to_proc,

								unsigned flags)

{

	return NULL;

}

arch/arm/mach-msm/pil-pronto.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static void log_wcnss_sfr(void) 
	char *smem_reset_reason;

	unsigned smem_reset_size;



	smem_reset_reason = smem_get_entry_to_proc(SMEM_SSR_REASON_WCNSS0,

	smem_reset_reason = smem_get_entry(SMEM_SSR_REASON_WCNSS0,

					   &smem_reset_size,

					   0,

					   SMEM_ANY_HOST_FLAG);

arch/arm/mach-msm/pil-q6v5-lpass.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static void adsp_log_failure_reason(void) 
	char buffer[81];

	unsigned size;



	reason = smem_get_entry_to_proc(SMEM_SSR_REASON_LPASS0, &size, 0,

	reason = smem_get_entry(SMEM_SSR_REASON_LPASS0, &size, 0,

							SMEM_ANY_HOST_FLAG);



	if (!reason) {

arch/arm/mach-msm/remote_spinlock.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ remote_spinlock_dal_init(const char *chunk_name, _remote_spinlock_t *lock) 
	if (!chunk_name)

		return -EINVAL;



	dal_smem_start = smem_get_entry_to_proc(SMEM_DAL_AREA, &dal_smem_size,

	dal_smem_start = smem_get_entry(SMEM_DAL_AREA, &dal_smem_size,

							0, SMEM_ANY_HOST_FLAG);

	if (!dal_smem_start)

		return -ENXIO;