summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-09-02 22:09:00 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-09-02 22:09:00 +0000
commit04aa59a8645510f212fc6a270b48a883f3d00fa5 (patch)
tree95c8f6738fa4dbaa09b7ee0f058de130333dc84c
parent0d5db9a8f86a2663570b05a557b49e0fa13f8631 (diff)
downloadflashrom-04aa59a8645510f212fc6a270b48a883f3d00fa5.tar.gz
flashrom-04aa59a8645510f212fc6a270b48a883f3d00fa5.tar.bz2
flashrom-04aa59a8645510f212fc6a270b48a883f3d00fa5.zip
Standardize on using __func__ instead of __FUNCTION__
The __func__ variant is standardized in C99 and recommended to be used instead of __FUNCTION__ in the gcc info page. Only _very_ old versions of gcc did not know about __func__, but we've been using both __func__ and __FUNCTION__ for a long while now, and nobody complained about this, so all our users seem to use recent enough compilers. Corresponding to flashrom svn r711. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Stefan Reinauer <stepan@coresystems.de>
-rw-r--r--82802ab.c2
-rw-r--r--am29f040b.c2
-rw-r--r--en29f002a.c4
-rw-r--r--ft2232_spi.c2
-rw-r--r--ichspi.c8
-rw-r--r--it87spi.c4
-rw-r--r--jedec.c2
-rw-r--r--m29f400bt.c2
-rw-r--r--mx29f002.c2
-rw-r--r--sharplhf00l04.c2
-rw-r--r--spi.c6
-rw-r--r--sst28sf040.c2
-rw-r--r--sst49lfxxxc.c2
-rw-r--r--stm50flw0x0x.c2
-rw-r--r--w29ee011.c2
-rw-r--r--w39v080fa.c2
16 files changed, 23 insertions, 23 deletions
diff --git a/82802ab.c b/82802ab.c
index 28fa17759..8aa189d4d 100644
--- a/82802ab.c
+++ b/82802ab.c
@@ -68,7 +68,7 @@ int probe_82802ab(struct flashchip *flash)
programmer_delay(10);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 != flash->manufacture_id || id2 != flash->model_id)
return 0;
diff --git a/am29f040b.c b/am29f040b.c
index 7f1269c3d..cde4b96ef 100644
--- a/am29f040b.c
+++ b/am29f040b.c
@@ -84,7 +84,7 @@ int probe_29f040b(struct flashchip *flash)
programmer_delay(10);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
diff --git a/en29f002a.c b/en29f002a.c
index b89eb316f..14fccabbc 100644
--- a/en29f002a.c
+++ b/en29f002a.c
@@ -47,7 +47,7 @@ int probe_en29f512(struct flashchip *flash)
chip_writeb(0x55, bios + 0x2AA);
chip_writeb(0xF0, bios + 0x555);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
@@ -80,7 +80,7 @@ int probe_en29f002a(struct flashchip *flash)
chip_writeb(0x55, bios + 0xAAA);
chip_writeb(0xF0, bios + 0x555);
- printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
diff --git a/ft2232_spi.c b/ft2232_spi.c
index 00490fed2..9bf1af3c0 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -285,7 +285,7 @@ int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf)
l = total_size - i;
if ((r = spi_nbyte_program(i, &buf[i], l))) {
- fprintf(stderr, "%s: write fail %d\n", __FUNCTION__, r);
+ fprintf(stderr, "%s: write fail %d\n", __func__, r);
return 1;
}
diff --git a/ichspi.c b/ichspi.c
index 831dd9d7e..017040cd0 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -216,7 +216,7 @@ static int generate_opcodes(OPCODES * op)
uint32_t opmenu[2];
if (op == NULL) {
- printf_debug("\n%s: null OPCODES pointer!\n", __FUNCTION__);
+ printf_debug("\n%s: null OPCODES pointer!\n", __func__);
return -1;
}
@@ -235,7 +235,7 @@ static int generate_opcodes(OPCODES * op)
opmenu[1] = REGREAD32(ICH9_REG_OPMENU + 4);
break;
default:
- printf_debug("%s: unsupported chipset\n", __FUNCTION__);
+ printf_debug("%s: unsupported chipset\n", __func__);
return -1;
}
@@ -317,7 +317,7 @@ int program_opcodes(OPCODES * op)
REGWRITE32(ICH9_REG_OPMENU + 4, opmenu[1]);
break;
default:
- printf_debug("%s: unsupported chipset\n", __FUNCTION__);
+ printf_debug("%s: unsupported chipset\n", __func__);
return -1;
}
@@ -610,7 +610,7 @@ static int run_opcode(OPCODE op, uint32_t offset,
return SPI_INVALID_LENGTH;
return ich9_run_opcode(op, offset, datalength, data);
default:
- printf_debug("%s: unsupported chipset\n", __FUNCTION__);
+ printf_debug("%s: unsupported chipset\n", __func__);
}
/* If we ever get here, something really weird happened */
diff --git a/it87spi.c b/it87spi.c
index 299725c7e..d58f83712 100644
--- a/it87spi.c
+++ b/it87spi.c
@@ -168,7 +168,7 @@ int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt,
} while (busy);
if (readcnt > 3) {
printf("%s called with unsupported readcnt %i.\n",
- __FUNCTION__, readcnt);
+ __func__, readcnt);
return SPI_INVALID_LENGTH;
}
switch (writecnt) {
@@ -198,7 +198,7 @@ int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt,
break;
default:
printf("%s called with unsupported writecnt %i.\n",
- __FUNCTION__, writecnt);
+ __func__, writecnt);
return SPI_INVALID_LENGTH;
}
/*
diff --git a/jedec.c b/jedec.c
index 0e426d6e1..d51f122c7 100644
--- a/jedec.c
+++ b/jedec.c
@@ -145,7 +145,7 @@ int probe_jedec(struct flashchip *flash)
chip_writeb(0xF0, bios + 0x5555);
programmer_delay(probe_timing_exit);
- printf_debug("%s: id1 0x%02x, id2 0x%02x", __FUNCTION__, largeid1, largeid2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2);
if (!oddparity(id1))
printf_debug(", id1 parity violation");
diff --git a/m29f400bt.c b/m29f400bt.c
index ace6dae14..28e5da451 100644
--- a/m29f400bt.c
+++ b/m29f400bt.c
@@ -75,7 +75,7 @@ int probe_m29f400bt(struct flashchip *flash)
programmer_delay(10);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
diff --git a/mx29f002.c b/mx29f002.c
index d5c60419f..f170360c1 100644
--- a/mx29f002.c
+++ b/mx29f002.c
@@ -36,7 +36,7 @@ int probe_29f002(struct flashchip *flash)
programmer_delay(10);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
diff --git a/sharplhf00l04.c b/sharplhf00l04.c
index 53b993156..03bb2cef2 100644
--- a/sharplhf00l04.c
+++ b/sharplhf00l04.c
@@ -60,7 +60,7 @@ int probe_lhf00l04(struct flashchip *flash)
programmer_delay(10);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 != flash->manufacture_id || id2 != flash->model_id)
return 0;
diff --git a/spi.c b/spi.c
index 7f678a139..7a17b2475 100644
--- a/spi.c
+++ b/spi.c
@@ -264,7 +264,7 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes)
id2 = (readarr[1] << 8) | readarr[2];
}
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id) {
/* Print the status register to tell the
@@ -321,7 +321,7 @@ int probe_spi_rems(struct flashchip *flash)
id1 = readarr[0];
id2 = readarr[1];
- printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id) {
/* Print the status register to tell the
@@ -356,7 +356,7 @@ int probe_spi_res(struct flashchip *flash)
return 0;
id2 = readarr[0];
- printf_debug("%s: id 0x%x\n", __FUNCTION__, id2);
+ printf_debug("%s: id 0x%x\n", __func__, id2);
if (id2 != flash->model_id)
return 0;
diff --git a/sst28sf040.c b/sst28sf040.c
index 35f8c2770..d3d7bdb3d 100644
--- a/sst28sf040.c
+++ b/sst28sf040.c
@@ -111,7 +111,7 @@ int probe_28sf040(struct flashchip *flash)
chip_writeb(RESET, bios);
programmer_delay(10);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
diff --git a/sst49lfxxxc.c b/sst49lfxxxc.c
index 848ccde21..a421acf5f 100644
--- a/sst49lfxxxc.c
+++ b/sst49lfxxxc.c
@@ -141,7 +141,7 @@ int probe_49lfxxxc(struct flashchip *flash)
chip_writeb(RESET, bios);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (!(id1 == flash->manufacture_id && id2 == flash->model_id))
return 0;
diff --git a/stm50flw0x0x.c b/stm50flw0x0x.c
index 30b7d50fd..3a90d6b0d 100644
--- a/stm50flw0x0x.c
+++ b/stm50flw0x0x.c
@@ -80,7 +80,7 @@ int probe_stm50flw0x0x(struct flashchip *flash)
chip_writeb(0xF0, bios + 0x5555);
programmer_delay(40);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, largeid1,
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, largeid1,
largeid2);
if (largeid1 != flash->manufacture_id || largeid2 != flash->model_id)
diff --git a/w29ee011.c b/w29ee011.c
index a26cd8060..de9a547cc 100644
--- a/w29ee011.c
+++ b/w29ee011.c
@@ -61,7 +61,7 @@ int probe_w29ee011(struct flashchip *flash)
chip_writeb(0xF0, bios + 0x5555);
programmer_delay(10);
- printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id)
return 1;
diff --git a/w39v080fa.c b/w39v080fa.c
index 31ef15f6b..96e83a8e1 100644
--- a/w39v080fa.c
+++ b/w39v080fa.c
@@ -41,7 +41,7 @@ int probe_winbond_fwhub(struct flashchip *flash)
chip_writeb(0xF0, bios + 0x5555);
programmer_delay(10);
- printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
+ printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2);
if (id1 != flash->manufacture_id || id2 != flash->model_id)
return 0;