Use the preferred order of 'static const' instead of 'const static'.

This is the common style in both Linux as well as in LinuxBIOS.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2922 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index 9331c65c3077a916e2b7acf48aaee3269fdf3d8c..e781aba827ea12278b7a50da6c1383c829f106ca 100644 (file)
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -25,7 +25,7 @@
 
 #define DEVICE_REV_REG         0x1f
 
-const static struct superio_registers reg_table[] = {
+static const struct superio_registers reg_table[] = {
        /* TODO: M5113 doesn't seem to have ID registers? */
        {0x5315, "M1535/M1535D/M1535+/M1535D+", {
                {NOLDN, NULL,

diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index 461be1821f5e4dd2be74aecbe7f84923bd2752c0..ab9b2d5b2bb841ad355a4a47bc513ee5cbecfce4 100644 (file)
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -29,7 +29,7 @@
 
 #define FINTEK_VENDOR_ID       0x3419
 
-const static struct superio_registers reg_table[] = {
+static const struct superio_registers reg_table[] = {
        {0x0106, "F71862FG", {
                {EOT}}},
        {0x4103, "F71872F/FG / F71806F/FG", {   /* Same ID? Datasheet typo? */

diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 060ebf2f45851915fa7b3c39eb06c43d02ccc9ae..47bf29fbe8731a73542de8c7b4fe9c229b516cc2 100644 (file)
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -26,7 +26,7 @@
 
 #define CHIP_VERSION_REG       0x22
 
-const static struct superio_registers reg_table[] = {
+static const struct superio_registers reg_table[] = {
        {0x8661, "IT8661F", {
                /* TODO: Needs different init sequence. */
                {NOLDN, NULL,

diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index 0edf2a0ab57cc53031831344061728c3535c5688..5cb0ec7fa5b09a9708026add13742fb1c27d3007 100644 (file)
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -24,7 +24,7 @@
 #define CHIP_ID_REG    0x20    /* Super I/O ID (SID) / family */
 #define CHIP_REV_REG   0x27    /* Super I/O revision ID (SRID) */
 
-const static struct superio_registers reg_table[] = {
+static const struct superio_registers reg_table[] = {
        {0xd0, "PC87371", {     /* From sensors-detect */
                {EOT}}},
        {0xdf, "PC97371", {     /* From sensors-detect */

diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index f26204dc51196286649c8ad2ffbc6feeb8e63abf..2a5487407df0909610df23eed32aef190f4aab1c 100644 (file)
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -26,7 +26,7 @@
 #define DEVICE_ID_REG          0x20
 #define DEVICE_REV_REG         0x21
 
-const static struct superio_registers reg_table[] = {
+static const struct superio_registers reg_table[] = {
        /* The following Super I/Os use the 0x20/0x21 ID registers. */
        {0x0e, "LPC47N252", {   /* From sensors-detect */
                {EOT}}},

diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 47561c9ef014a75dd8f48acaefe8142d594d7557..cbff346f52bdca4e33396af554f67c370e268b79 100644 (file)
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
 {
        int i, j, opt, option_index;
 
-       const static struct option long_options[] = {
+       static const struct option long_options[] = {
                {"dump",                no_argument, NULL, 'd'},
                {"verbose",             no_argument, NULL, 'V'},
                {"version",             no_argument, NULL, 'v'},

diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 38f9cdfc1a6863b6e72f0b48dfd6eed5b4ec6f92..97daed96f410aa9a701c723901b73c5c43142243 100644 (file)
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -100,7 +100,7 @@ void probe_idregs_smsc(uint16_t port);
 void probe_idregs_winbond(uint16_t port);
 
 /** Table of which config ports to probe for each Super I/O family. */
-const static struct {
+static const struct {
        void (*probe_idregs) (uint16_t port);
        int ports[MAXNUMPORTS]; /* Signed, as we need EOT. */
 } superio_ports_table[] = {

diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index d7a8b9a18fc51cb65a2c451f43064518b238213d..671a82568417d5fe3865cbd091f0b0a9fbb2f2c6 100644 (file)
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -36,7 +36,7 @@
  *
  * Some other Super I/Os only use bits 3..0 of 0x09 as ID.
  */
-const static struct superio_registers reg_table[] = {
+static const struct superio_registers reg_table[] = {
        /* ID and rev[3..0] */
        {0x527, "W83977CTF", {  /* TODO: Not yet in sensors-detect */
                {EOT}}},