From c9b13594eb8d425e54a126b5c10e3f6fbc41528b Mon Sep 17 00:00:00 2001
From: Patrick Georgi <pgeorgi@google.com>
Date: Fri, 29 Nov 2019 11:47:47 +0100
Subject: src/: Remove g_ prefixes and _g suffixes from variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These were often used to distinguish CAR_GLOBAL variables that weren't
directly usable. Since we're getting rid of this special case, also get
rid of the marker.

This change was created using coccinelle and the following script:
	@match@
	type T;
	identifier old =~ "^(g_.*|.*_g)$";
	@@
	old

	@script:python global_marker@
	old << match.old;
	new;
	@@
	new = old
	if old[0:2] == "g_":
	  new = new[2:]

	if new[-2:] == "_g":
	  new = new[:-2]

	coccinelle.new = new

	@@
	identifier match.old, global_marker.new;
	@@
	- old
	+ new

	@@
	type T;
	identifier match.old, global_marker.new;
	@@
	- T old;
	+ T new;

	@@
	type T;
	identifier match.old, global_marker.new;
	@@
	- T old
	+ T new
	 = ...;

There were some manual fixups: Some code still uses the global/local
variable naming scheme, so keep g_* there, and some variable names
weren't completely rewritten.

Change-Id: I4936ff9780a0d3ed9b8b539772bc48887f8d5eed
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37358
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
---
 src/cpu/intel/common/fsb.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/cpu/intel')

diff --git a/src/cpu/intel/common/fsb.c b/src/cpu/intel/common/fsb.c
index 0f6fd1d921..726ab1c240 100644
--- a/src/cpu/intel/common/fsb.c
+++ b/src/cpu/intel/common/fsb.c
@@ -19,8 +19,8 @@
 #include <commonlib/helpers.h>
 #include <delay.h>
 
-static u32 g_timer_fsb;
-static u32 g_timer_tsc;
+static u32 timer_fsb;
+static u32 timer_tsc;
 
 /* This is not an architectural MSR. */
 #define MSR_PLATFORM_INFO 0xce
@@ -98,8 +98,8 @@ static void resolve_timebase(void)
 	ret = get_fsb_tsc(&fsb, &ratio);
 	if (ret == 0) {
 		u32 tsc = 100 * DIV_ROUND_CLOSEST(ratio * fsb, 100);
-		g_timer_fsb = fsb;
-		g_timer_tsc = tsc;
+		timer_fsb = fsb;
+		timer_tsc = tsc;
 		return;
 	}
 
@@ -109,27 +109,27 @@ static void resolve_timebase(void)
 		printk(BIOS_ERR, "CPU not supported\n");
 
 	/* Set some semi-ridiculous defaults. */
-	g_timer_fsb = 500;
-	g_timer_tsc = 5000;
+	timer_fsb = 500;
+	timer_tsc = 5000;
 	return;
 }
 
 u32 get_timer_fsb(void)
 {
-	if (g_timer_fsb > 0)
-		return g_timer_fsb;
+	if (timer_fsb > 0)
+		return timer_fsb;
 
 	resolve_timebase();
-	return g_timer_fsb;
+	return timer_fsb;
 }
 
 unsigned long tsc_freq_mhz(void)
 {
-	if (g_timer_tsc > 0)
-		return g_timer_tsc;
+	if (timer_tsc > 0)
+		return timer_tsc;
 
 	resolve_timebase();
-	return g_timer_tsc;
+	return timer_tsc;
 }
 
 /**
-- 
cgit v1.2.3