summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2018-12-19 11:54:47 +0000
committerNico Huber <nico.h@gmx.de>2019-02-03 18:31:45 +0000
commit93e1625f9fb5f1080c40685488d006b2982062d7 (patch)
tree810e5b2807d6f5c102059e2b8a99a91a17c8f9c7
parentd82be7b2be34fb3273781e72f5d8e52a3103b961 (diff)
downloadflashrom-93e1625f9fb5f1080c40685488d006b2982062d7.tar.gz
flashrom-93e1625f9fb5f1080c40685488d006b2982062d7.tar.bz2
flashrom-93e1625f9fb5f1080c40685488d006b2982062d7.zip
Fix several -Wold-style-declaration warnings
Change-Id: Iffe5e652779a13ee7f64696fb5df4a781fe9a632 Signed-off-by: Richard Hughes <richard@hughsie.com> Reviewed-on: https://review.coreboot.org/c/30404 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--board_enable.c2
-rw-r--r--flashrom.c4
-rw-r--r--ichspi.c2
-rw-r--r--nicintel_spi.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/board_enable.c b/board_enable.c
index 9d4581328..00809f71d 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -2585,7 +2585,7 @@ static const struct board_match *board_match_name(const char *vendor, const char
* Match boards on PCI IDs and subsystem IDs.
* Second set of IDs can be either main+subsystem IDs, main IDs or no IDs.
*/
-const static struct board_match *board_match_pci_ids(enum board_match_phase phase)
+static const struct board_match *board_match_pci_ids(enum board_match_phase phase)
{
const struct board_match *board = board_matches;
diff --git a/flashrom.c b/flashrom.c
index 7129a51a7..cb2da46f7 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -455,10 +455,10 @@ const struct programmer_entry programmer_table[] = {
#define SHUTDOWN_MAXFN 32
static int shutdown_fn_count = 0;
/** @private */
-struct shutdown_func_data {
+static struct shutdown_func_data {
int (*func) (void *data);
void *data;
-} static shutdown_fn[SHUTDOWN_MAXFN];
+} shutdown_fn[SHUTDOWN_MAXFN];
/* Initialize to 0 to make sure nobody registers a shutdown function before
* programmer init.
*/
diff --git a/ichspi.c b/ichspi.c
index 9eb24a99d..21442084f 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -676,7 +676,7 @@ static int program_opcodes(OPCODES *op, int enable_undo)
* - at least one program opcode (BYTE_PROGRAM, AAI_WORD_PROGRAM, ...?)
* - necessary preops? (EWSR, WREN, ...?)
*/
-static int ich_missing_opcodes()
+static int ich_missing_opcodes(void)
{
uint8_t ops[] = {
JEDEC_READ,
diff --git a/nicintel_spi.c b/nicintel_spi.c
index 4d20c408f..f31a2f92a 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -218,7 +218,7 @@ static int nicintel_spi_82599_enable_flash(void)
return 0;
}
-static int nicintel_spi_i210_enable_flash()
+static int nicintel_spi_i210_enable_flash(void)
{
uint32_t tmp;