openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

tree/: Rename 'laptop_ok-> g_laptop_ok' to avoid shadowing

Browse Source 
Avoid global symbol shadowing in local functions.

Change-Id: Idfca0b7e46d8051bf680227250cf40483e19dc53
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/73646
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sam McNally <sammc@google.com>
This commit is contained in:
Edward O'Callaghan 2023-03-11 10:48:09 +11:00 committed by Edward O'Callaghan
parent 9a2284503e
commit c65379cba2
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board_enable.c
View File

@ -2293,7 +2293,7 @@ static int p2_not_a_laptop(void)
static int p2_whitelist_laptop(void) static int p2_whitelist_laptop(void)
{ {
is_laptop = 1; is_laptop = 1;
laptop_ok = true; g_laptop_ok = true;
msg_pdbg("Whitelisted laptop detected.\n"); msg_pdbg("Whitelisted laptop detected.\n");
return 0; return 0;
} }

8
chipset_enable.c
View File

@ -826,7 +826,7 @@ static int enable_flash_ich_spi(const struct programmer_cfg *cfg, struct pci_dev
/* Suppress unknown laptop warning if we booted from SPI. */ /* Suppress unknown laptop warning if we booted from SPI. */
if (boot_buses & BUS_SPI) if (boot_buses & BUS_SPI)
laptop_ok = true; g_laptop_ok = true;
return 0; return 0;
} }
@ -971,7 +971,7 @@ static int enable_flash_pch100_or_c620(const struct programmer_cfg *cfg,
/* Suppress unknown laptop warning if we booted from SPI. */ /* Suppress unknown laptop warning if we booted from SPI. */
if (!ret && (boot_buses & BUS_SPI)) if (!ret && (boot_buses & BUS_SPI))
laptop_ok = true; g_laptop_ok = true;
_freepci_ret: _freepci_ret:
pci_free_dev(spi_dev); pci_free_dev(spi_dev);
@ -1087,7 +1087,7 @@ static int enable_flash_silvermont(const struct programmer_cfg *cfg, struct pci_
/* Suppress unknown laptop warning if we booted from SPI. */ /* Suppress unknown laptop warning if we booted from SPI. */
if (boot_buses & BUS_SPI) if (boot_buses & BUS_SPI)
laptop_ok = true; g_laptop_ok = true;
return 0; return 0;
} }
@ -1676,7 +1676,7 @@ static int enable_flash_mcp6x_7x(const struct programmer_cfg *cfg, struct pci_de
/* Suppress unknown laptop warning if we booted from SPI. */ /* Suppress unknown laptop warning if we booted from SPI. */
if (!ret && want_spi) if (!ret && want_spi)
laptop_ok = true; g_laptop_ok = true;
return ret; return ret;
} }

2
include/programmer.h
View File

@ -264,7 +264,7 @@ extern int superio_count;
#if CONFIG_INTERNAL == 1 #if CONFIG_INTERNAL == 1
extern int is_laptop; extern int is_laptop;
extern bool laptop_ok; extern bool g_laptop_ok;
extern bool force_boardmismatch; extern bool force_boardmismatch;
void probe_superio(void); void probe_superio(void);
int register_superio(struct superio s); int register_superio(struct superio s);

12
internal.c
View File

@ -28,7 +28,7 @@
#endif #endif
int is_laptop = 0; int is_laptop = 0;
bool laptop_ok = false; bool g_laptop_ok = false;
bool force_boardmismatch = false; bool force_boardmismatch = false;
@ -109,9 +109,9 @@ static int get_params(const struct programmer_cfg *cfg,
} }
// FIXME: remove '_' suffix from parameters once global shadowing is fixed. // FIXME: remove '_' suffix from parameters once global shadowing is fixed.
static void report_nonwl_laptop_detected(int is_laptop_, bool laptop_ok_) static void report_nonwl_laptop_detected(int is_laptop_, bool laptop_ok)
{ {
if (is_laptop_ && !laptop_ok_) { if (is_laptop_ && !laptop_ok) {
msg_pinfo("========================================================================\n"); msg_pinfo("========================================================================\n");
if (is_laptop_ == 1) { if (is_laptop_ == 1) {
msg_pinfo("You seem to be running flashrom on an unknown laptop. Some\n" msg_pinfo("You seem to be running flashrom on an unknown laptop. Some\n"
@ -159,7 +159,7 @@ static int internal_init(const struct programmer_cfg *cfg)
return ret; return ret;
/* Unconditionally reset global state from previous operation. */ /* Unconditionally reset global state from previous operation. */
laptop_ok = false; g_laptop_ok = false;
/* Default to Parallel/LPC/FWH flash devices. If a known host controller /* Default to Parallel/LPC/FWH flash devices. If a known host controller
* is found, the host controller init routine sets the * is found, the host controller init routine sets the
@ -229,7 +229,7 @@ static int internal_init(const struct programmer_cfg *cfg)
* this isn't a laptop. Board-enables may override this, * this isn't a laptop. Board-enables may override this,
* non-legacy buses (SPI and opaque atm) are probed anyway. * non-legacy buses (SPI and opaque atm) are probed anyway.
*/ */
if (is_laptop && !(laptop_ok || force_laptop || (not_a_laptop && is_laptop == 2))) if (is_laptop && !(g_laptop_ok || force_laptop || (not_a_laptop && is_laptop == 2)))
internal_buses_supported = BUS_NONE; internal_buses_supported = BUS_NONE;
/* try to enable it. Failure IS an option, since not all motherboards /* try to enable it. Failure IS an option, since not all motherboards
@ -258,7 +258,7 @@ static int internal_init(const struct programmer_cfg *cfg)
internal_par_init(internal_buses_supported); internal_par_init(internal_buses_supported);
/* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */ /* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */
report_nonwl_laptop_detected(is_laptop, laptop_ok); report_nonwl_laptop_detected(is_laptop, g_laptop_ok);
ret = 0; ret = 0;