Kyösti Mälkki merged this change.

View Change

soc/intel: Fix invalid use of 'static'

Just keep the variables on the stack.

Change-Id: I36b29d8fb7dac159b29609033cba450bea9adf77
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34326
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
---
M src/mainboard/purism/librem_skl/hda_verb.c
M src/soc/intel/apollolake/chip.c
M src/soc/intel/skylake/chip_fsp20.c
M src/soc/intel/skylake/thermal.c
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/purism/librem_skl/hda_verb.c b/src/mainboard/purism/librem_skl/hda_verb.c
index c0de990..206af8d 100644
--- a/src/mainboard/purism/librem_skl/hda_verb.c
+++ b/src/mainboard/purism/librem_skl/hda_verb.c
@@ -40,7 +40,7 @@
 
 static void mb_hda_codec_init(void *unused)
 {
-	static struct soc_intel_skylake_config *config;
+	struct soc_intel_skylake_config *config;
 	u8 *base;
 	struct resource *res;
 	u32 codec_mask;
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 3c4bf96..361e6a4 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -294,7 +294,7 @@
 /* Configure package power limits */
 static void set_power_limits(void)
 {
-	static struct soc_intel_apollolake_config *cfg;
+	struct soc_intel_apollolake_config *cfg;
 	msr_t rapl_msr_reg, limit;
 	uint32_t power_unit;
 	uint32_t tdp, min_power, max_power;
@@ -361,7 +361,7 @@
 /* Overwrites the SCI IRQ if another IRQ number is given by device tree. */
 static void set_sci_irq(void)
 {
-	static struct soc_intel_apollolake_config *cfg;
+	struct soc_intel_apollolake_config *cfg;
 	uint32_t scis;
 
 	cfg = config_of_path(SA_DEVFN_ROOT);
@@ -666,7 +666,7 @@
 void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
 {
 	FSP_S_CONFIG *silconfig = &silupd->FspsConfig;
-	static struct soc_intel_apollolake_config *cfg;
+	struct soc_intel_apollolake_config *cfg;
 	struct device *dev;
 
 	/* Load VBT before devicetree-specific config. */
diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c
index 5b61df3..064f71e 100644
--- a/src/soc/intel/skylake/chip_fsp20.c
+++ b/src/soc/intel/skylake/chip_fsp20.c
@@ -232,7 +232,7 @@
 {
 	FSP_S_CONFIG *params = &supd->FspsConfig;
 	FSP_S_TEST_CONFIG *tconfig = &supd->FspsTestConfig;
-	static struct soc_intel_skylake_config *config;
+	struct soc_intel_skylake_config *config;
 	struct device *dev;
 	uintptr_t vbt_data = (uintptr_t)vbt_get();
 	int i;
diff --git a/src/soc/intel/skylake/thermal.c b/src/soc/intel/skylake/thermal.c
index 97cd1b7..936543c 100644
--- a/src/soc/intel/skylake/thermal.c
+++ b/src/soc/intel/skylake/thermal.c
@@ -62,7 +62,7 @@
 /* PCH Low Temp Threshold (LTT) */
 static uint16_t pch_get_ltt_value(struct device *dev)
 {
-	static struct soc_intel_skylake_config *config;
+	struct soc_intel_skylake_config *config;
 	uint16_t ltt_value;
 	uint16_t trip_temp = DEFAULT_TRIP_TEMP;
 

To view, visit change 34326. To unsubscribe, or for help writing mail filters, visit settings.