diff mbox

[2/2] linux-generic: odp_system_info: rename odp_system_info

Message ID 1427927394-15702-2-git-send-email-mike.holmes@linaro.org
State New
Headers show

Commit Message

Mike Holmes April 1, 2015, 10:29 p.m. UTC 
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
 platform/linux-generic/include/odp_internal.h |  3 +--
 platform/linux-generic/odp_system_info.c      | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)
diff mbox

Patch

diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index 64dee42..1ced46c 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -31,11 +31,10 @@  typedef struct {
 	char     model_str[128];
 
 } odp_system_info_t;
-
 struct odp_global_data_s {
 	odp_log_func_t log_fn;
 	odp_abort_func_t abort_fn;
-	odp_system_info_t odp_system_info;
+	odp_system_info_t system_info;
 };
 
 extern struct odp_global_data_s odp_global_data;
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index cae310f..077e015 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -299,7 +299,7 @@  static int systemcpu(odp_system_info_t *sysinfo)
 		return -1;
 	}
 
-	odp_global_data.odp_system_info.huge_page_size = huge_page_size();
+	odp_global_data.system_info.huge_page_size = huge_page_size();
 
 	return 0;
 }
@@ -343,9 +343,9 @@  int odp_system_info_init(void)
 {
 	FILE  *file;
 
-	memset(&odp_global_data.odp_system_info, 0, sizeof(odp_system_info_t));
+	memset(&odp_global_data.system_info, 0, sizeof(odp_system_info_t));
 
-	odp_global_data.odp_system_info.page_size = ODP_PAGE_SIZE;
+	odp_global_data.system_info.page_size = ODP_PAGE_SIZE;
 
 	file = fopen("/proc/cpuinfo", "rt");
 	if (file == NULL) {
@@ -353,11 +353,11 @@  int odp_system_info_init(void)
 		return -1;
 	}
 
-	compiler_info.cpuinfo_parser(file, &odp_global_data.odp_system_info);
+	compiler_info.cpuinfo_parser(file, &odp_global_data.system_info);
 
 	fclose(file);
 
-	if (systemcpu(&odp_global_data.odp_system_info)) {
+	if (systemcpu(&odp_global_data.system_info)) {
 		ODP_ERR("systemcpu failed\n");
 		return -1;
 	}
@@ -372,30 +372,30 @@  int odp_system_info_init(void)
  */
 uint64_t odp_sys_cpu_hz(void)
 {
-	return odp_global_data.odp_system_info.cpu_hz;
+	return odp_global_data.system_info.cpu_hz;
 }
 
 uint64_t odp_sys_huge_page_size(void)
 {
-	return odp_global_data.odp_system_info.huge_page_size;
+	return odp_global_data.system_info.huge_page_size;
 }
 
 uint64_t odp_sys_page_size(void)
 {
-	return odp_global_data.odp_system_info.page_size;
+	return odp_global_data.system_info.page_size;
 }
 
 const char *odp_sys_cpu_model_str(void)
 {
-	return odp_global_data.odp_system_info.model_str;
+	return odp_global_data.system_info.model_str;
 }
 
 int odp_sys_cache_line_size(void)
 {
-	return odp_global_data.odp_system_info.cache_line_size;
+	return odp_global_data.system_info.cache_line_size;
 }
 
 int odp_cpu_count(void)
 {
-	return odp_global_data.odp_system_info.cpu_count;
+	return odp_global_data.system_info.cpu_count;
 }