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

soc: qcom: socinfo: simplify searching for smem regions

Browse source 
Instead calling smem_find() repeatedly with different sizes
for SMEM_HW_SW_BUILD_ID, call smem_get_entry() which returns
a pointer to the region regardless of its size.

Change-Id: If68ab31f808e2ecb740e1560ec5d9a7edd9a8c9f
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
This commit is contained in:
Matt Wagantall 2015-06-10 12:14:06 -07:00 • committed by David Keitel
parent 52dabc73a5
commit 137431c1fb
1 changed files with 3 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/soc/qcom/socinfo.c
View file

@ -1268,69 +1268,13 @@ static void socinfo_print(void)
int __init socinfo_init(void) int __init socinfo_init(void)
{ {
static bool socinfo_init_done; static bool socinfo_init_done;
unsigned size;
if (socinfo_init_done) if (socinfo_init_done)
return 0; return 0;
socinfo = smem_find(SMEM_HW_SW_BUILD_ID, socinfo = smem_get_entry(SMEM_HW_SW_BUILD_ID, &size, 0,
sizeof(struct socinfo_v10), SMEM_ANY_HOST_FLAG);
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v9),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v8),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v7),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v6),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v5),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v4),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v3),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v2),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo))
socinfo = smem_find(SMEM_HW_SW_BUILD_ID,
sizeof(struct socinfo_v1),
0,
SMEM_ANY_HOST_FLAG);
if (IS_ERR_OR_NULL(socinfo)) { if (IS_ERR_OR_NULL(socinfo)) {
pr_warn("%s: Can't find SMEM_HW_SW_BUILD_ID; falling back on dummy values.\n", pr_warn("%s: Can't find SMEM_HW_SW_BUILD_ID; falling back on dummy values.\n",
__func__); __func__);