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>
diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 5eb3761..9921825 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 @@
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 @@
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 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 @@
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)