i2c: Storage class should be before const qualifier

The C99 specification states in section 6.11.5:

The placement of a storage-class specifier other than at the
beginning of the declaration specifiers in a declaration is an
obsolescent feature.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index be99c02ecac57e84c5616a073ea7821dd2809fdf..b03af5653c6521ec28e3fb8c626d0bc02a226afe 100644 (file)
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -122,7 +122,7 @@ struct pmcmsptwi_data {
 };
 
 /* The default settings */
-const static struct pmcmsptwi_clockcfg pmcmsptwi_defclockcfg = {
+static const struct pmcmsptwi_clockcfg pmcmsptwi_defclockcfg = {
        .standard = {
                .filter = 0x3,
                .clock  = 0x1f,
@@ -133,7 +133,7 @@ const static struct pmcmsptwi_clockcfg pmcmsptwi_defclockcfg = {
        },
 };
 
-const static struct pmcmsptwi_cfg pmcmsptwi_defcfg = {
+static const struct pmcmsptwi_cfg pmcmsptwi_defcfg = {
        .arbf           = 0x03,
        .nak            = 0x03,
        .add10          = 0x00,

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 76014f8f3c60cb3306600780f032c117969d0946..2d1c608eb5db856880af3534ac81e9b06c43a857 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -598,7 +598,7 @@ I2C_CLIENT_MODULE_PARM(probe, "List of adapter,address pairs to scan "      \
                       "additionally");                                 \
 I2C_CLIENT_MODULE_PARM(ignore, "List of adapter,address pairs not to " \
                       "scan");                                         \
-const static struct i2c_client_address_data addr_data = {              \
+static const struct i2c_client_address_data addr_data = {              \
        .normal_i2c     = normal_i2c,                                   \
        .probe          = probe,                                        \
        .ignore         = ignore,                                       \