Nico Huber has uploaded this change for review.

View Change

Fix several -Wold-style-declaration warnings

Change-Id: Iffe5e652779a13ee7f64696fb5df4a781fe9a632
Signed-off-by: Richard Hughes <richard@hughsie.com>
---
M board_enable.c
M flashrom.c
M ichspi.c
M nicintel_spi.c
4 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/30404/1
diff --git a/board_enable.c b/board_enable.c
index 9d45813..00809f7 100644
--- a/board_enable.c
+++ b/board_enable.c
@@ -2585,7 +2585,7 @@
* 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 59a7531..55293dd 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -443,10 +443,10 @@
#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 9eb24a9..2144208 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -676,7 +676,7 @@
* - 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 4d20c40..f31a2f9 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -218,7 +218,7 @@
return 0;
}

-static int nicintel_spi_i210_enable_flash()
+static int nicintel_spi_i210_enable_flash(void)
{
uint32_t tmp;


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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Iffe5e652779a13ee7f64696fb5df4a781fe9a632
Gerrit-Change-Number: 30404
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h@gmx.de>
Gerrit-MessageType: newchange