[flashrom] [commit] r1646 - trunk

[repository service]

Author: stefanct
Date: Tue Jan 15 18:37:48 2013
New Revision: 1646
URL: http://flashrom.org/trac/flashrom/changeset/1646

Log:
Fix duplicate 'const' declaration specifiers.

Thanks to Idwer and clang for noticing these problems.

Signed-off-by: Stefan Tauner 
Signed-off-by: Idwer Vollering 
Acked-by: Stefan Tauner

Modified:
   trunk/bitbang_spi.c
   trunk/dummyflasher.c
   trunk/ich_descriptors.c
   trunk/ichspi.c

Modified: trunk/bitbang_spi.c
==============================================================================
--- trunk/bitbang_spi.c	Tue Jan  8 23:49:12 2013	(r1645)
+++ trunk/bitbang_spi.c	Tue Jan 15 18:37:48 2013	(r1646)
@@ -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();

Modified: trunk/dummyflasher.c
==============================================================================
--- trunk/dummyflasher.c	Tue Jan  8 23:49:12 2013	(r1645)
+++ trunk/dummyflasher.c	Tue Jan 15 18:37:48 2013	(r1646)
@@ -66,7 +66,7 @@
 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

Modified: trunk/ich_descriptors.c
==============================================================================
--- trunk/ich_descriptors.c	Tue Jan  8 23:49:12 2013	(r1645)
+++ trunk/ich_descriptors.c	Tue Jan 15 18:37:48 2013	(r1646)
@@ -335,7 +335,7 @@

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,

Modified: trunk/ichspi.c
==============================================================================
--- trunk/ichspi.c	Tue Jan  8 23:49:12 2013	(r1645)
+++ trunk/ichspi.c	Tue Jan 15 18:37:48 2013	(r1646)
@@ -1127,7 +1127,7 @@
 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,