src/: Remove g_ prefixes and _g suffixes from variables

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>

5 files changed, 15 insertions, 15 deletions

diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 5eb37611f5..99218253ae 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -88,7 +88,7 @@
 
 static struct cse_device {
 	uintptr_t sec_bar;
-} g_cse;
+} cse;
 
 /*
  * Initialize the device with provided temporary BAR. If BAR is 0 use a
@@ -105,7 +105,7 @@ void heci_init(uintptr_t tempbar)
 	u8 pcireg;
 
 	/* Assume it is already initialized, nothing else to do */
-	if (g_cse.sec_bar)
+	if (cse.sec_bar)
 		return;
 
 	/* Use default pre-ram bar */
@@ -127,7 +127,7 @@ void heci_init(uintptr_t tempbar)
 	pcireg |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
 	pci_write_config8(dev, PCI_COMMAND, pcireg);
 
-	g_cse.sec_bar = tempbar;
+	cse.sec_bar = tempbar;
 }
 
 /* Get HECI BAR 0 from PCI configuration space */
@@ -147,17 +147,17 @@ static uint32_t get_cse_bar(void)
 static uint32_t read_bar(uint32_t offset)
 {
 	/* Reach PCI config space to get BAR in case CAR global not available */
-	if (!g_cse.sec_bar)
-		g_cse.sec_bar = get_cse_bar();
-	return read32((void *)(g_cse.sec_bar + offset));
+	if (!cse.sec_bar)
+		cse.sec_bar = get_cse_bar();
+	return read32((void *)(cse.sec_bar + offset));
 }
 
 static void write_bar(uint32_t offset, uint32_t val)
 {
 	/* Reach PCI config space to get BAR in case CAR global not available */
-	if (!g_cse.sec_bar)
-		g_cse.sec_bar = get_cse_bar();
-	return write32((void *)(g_cse.sec_bar + offset), val);
+	if (!cse.sec_bar)
+		cse.sec_bar = get_cse_bar();
+	return write32((void *)(cse.sec_bar + offset), val);
 }
 
 static uint32_t read_cse_csr(void)
@@ -725,7 +725,7 @@ int send_hmrfpo_get_status_msg(void)
 
 static void update_sec_bar(struct device *dev)
 {
-	g_cse.sec_bar = find_resource(dev, PCI_BASE_ADDRESS_0)->base;
+	cse.sec_bar = find_resource(dev, PCI_BASE_ADDRESS_0)->base;
 }
 
 static void cse_set_resources(struct device *dev)
diff --git a/src/soc/nvidia/tegra/i2c.c b/src/soc/nvidia/tegra/i2c.c
index 0e9553c8ed..3ca0e13fa4 100644
--- a/src/soc/nvidia/tegra/i2c.c
+++ b/src/soc/nvidia/tegra/i2c.c
@@ -193,7 +193,7 @@ int platform_i2c_transfer(unsigned int bus, struct i2c_msg *segments, int count)
 	struct i2c_msg *seg = segments;
 	int i;
 
-	if (bus >= g_num_i2c_buses) {
+	if (bus >= num_i2c_buses) {
 		printk(BIOS_ERR, "%s: ERROR: invalid I2C bus (%u)\n", __func__,
 		       bus);
 		return -1;
@@ -212,7 +212,7 @@ void i2c_init(unsigned int bus)
 {
 	struct tegra_i2c_regs *regs;
 
-	if (bus >= g_num_i2c_buses) {
+	if (bus >= num_i2c_buses) {
 		printk(BIOS_ERR, "%s: ERROR: invalid I2C bus (%u)\n", __func__,
 		       bus);
 		return;
diff --git a/src/soc/nvidia/tegra/i2c.h b/src/soc/nvidia/tegra/i2c.h
index a2bf9508be..c32450b824 100644
--- a/src/soc/nvidia/tegra/i2c.h
+++ b/src/soc/nvidia/tegra/i2c.h
@@ -168,6 +168,6 @@ struct tegra_i2c_regs {
 };
 check_member(tegra_i2c_regs, config_load, 0x8C);
 
-extern unsigned int g_num_i2c_buses;
+extern unsigned int num_i2c_buses;
 
 #endif	/* __SOC_NVIDIA_TEGRA_I2C_H__ */
diff --git a/src/soc/nvidia/tegra124/i2c.c b/src/soc/nvidia/tegra124/i2c.c
index ee339bbe48..0d65b9a018 100644
--- a/src/soc/nvidia/tegra124/i2c.c
+++ b/src/soc/nvidia/tegra124/i2c.c
@@ -50,4 +50,4 @@ struct tegra_i2c_bus_info tegra_i2c_info[] = {
 	}
 };
 
-unsigned int g_num_i2c_buses = ARRAY_SIZE(tegra_i2c_info);
+unsigned int num_i2c_buses = ARRAY_SIZE(tegra_i2c_info);
diff --git a/src/soc/nvidia/tegra210/i2c.c b/src/soc/nvidia/tegra210/i2c.c
index 34aae5a639..4764b78303 100644
--- a/src/soc/nvidia/tegra210/i2c.c
+++ b/src/soc/nvidia/tegra210/i2c.c
@@ -50,4 +50,4 @@ struct tegra_i2c_bus_info tegra_i2c_info[] = {
 	}
 };
 
-unsigned int g_num_i2c_buses = ARRAY_SIZE(tegra_i2c_info);
+unsigned int num_i2c_buses = ARRAY_SIZE(tegra_i2c_info);