From 67d163d2fa6e7db9673e8ec820b8ef21bca5e907 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Tue, 15 Jan 2013 17:37:48 +0000 Subject: Fix duplicate 'const' declaration specifiers Thanks to Idwer and clang for noticing these problems. Corresponding to flashrom svn r1646. Signed-off-by: Stefan Tauner Signed-off-by: Idwer Vollering Acked-by: Stefan Tauner --- bitbang_spi.c | 12 ++++++------ dummyflasher.c | 2 +- ich_descriptors.c | 2 +- ichspi.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bitbang_spi.c b/bitbang_spi.c index 11d2de1e..b10fc260 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -26,33 +26,33 @@ #include "spi.h" /* Note that CS# is active low, so val=0 means the chip is active. */ -static void bitbang_spi_set_cs(const const struct bitbang_spi_master *master, int val) +static void bitbang_spi_set_cs(const struct bitbang_spi_master * const master, int val) { master->set_cs(val); } -static void bitbang_spi_set_sck(const const struct bitbang_spi_master *master, int val) +static void bitbang_spi_set_sck(const struct bitbang_spi_master * const master, int val) { master->set_sck(val); } -static void bitbang_spi_set_mosi(const const struct bitbang_spi_master *master, int val) +static void bitbang_spi_set_mosi(const struct bitbang_spi_master * const master, int val) { master->set_mosi(val); } -static int bitbang_spi_get_miso(const const struct bitbang_spi_master *master) +static int bitbang_spi_get_miso(const struct bitbang_spi_master * const master) { return master->get_miso(); } -static void bitbang_spi_request_bus(const const struct bitbang_spi_master *master) +static void bitbang_spi_request_bus(const struct bitbang_spi_master * const master) { if (master->request_bus) master->request_bus(); } -static void bitbang_spi_release_bus(const const struct bitbang_spi_master *master) +static void bitbang_spi_release_bus(const struct bitbang_spi_master * const master) { if (master->release_bus) master->release_bus(); diff --git a/dummyflasher.c b/dummyflasher.c index 655b6781..383ca585 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -66,7 +66,7 @@ int spi_ignorelist_size = 0; static uint8_t emu_status = 0; /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */ -static const uint8_t const sfdp_table[] = { +static const uint8_t sfdp_table[] = { 0x53, 0x46, 0x44, 0x50, // @0x00: SFDP signature 0x00, 0x01, 0x01, 0xFF, // @0x04: revision 1.0, 2 headers 0x00, 0x00, 0x01, 0x09, // @0x08: JEDEC SFDP header rev. 1.0, 9 DW long diff --git a/ich_descriptors.c b/ich_descriptors.c index c9ae6cd7..e5ca87a9 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -335,7 +335,7 @@ void prettyprint_ich_descriptor_pchstraps111213_56(const struct ich_desc_south_s void prettyprint_ich_descriptor_straps_ibex(const struct ich_desc_south_strap *s) { - static const uint8_t const dec_t209min[4] = { + static const uint8_t dec_t209min[4] = { 100, 50, 5, diff --git a/ichspi.c b/ichspi.c index 2a3d58a1..12f45840 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1127,7 +1127,7 @@ static void ich_hwseq_set_addr(uint32_t addr) static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr) { uint8_t enc_berase; - static const uint32_t const dec_berase[4] = { + static const uint32_t dec_berase[4] = { 256, 4 * 1024, 8 * 1024, -- cgit v1.2.3