Merge branch 'smsc47b397-new-id' into release

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-pmcmsp.c

diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index 17cecf1ea79767ed701e49a3d974ccfb48fe84f3..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,
@@ -591,18 +591,18 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,
        if (msg->flags & I2C_M_TEN)
                pmcmsptwi_set_twi_config(&oldcfg, data);
 
-       dev_dbg(&adap->dev, "I2C %s of %d bytes ",
-               (msg->flags & I2C_M_RD) ? "read" : "write", msg->len);
+       dev_dbg(&adap->dev, "I2C %s of %d bytes %s\n",
+               (msg->flags & I2C_M_RD) ? "read" : "write", msg->len,
+               (ret == MSP_TWI_XFER_OK) ? "succeeded" : "failed");
+
        if (ret != MSP_TWI_XFER_OK) {
                /*
                 * TODO: We could potentially loop and retry in the case
                 * of MSP_TWI_XFER_TIMEOUT.
                 */
-               dev_dbg(&adap->dev, "failed\n");
                return -1;
        }
 
-       dev_dbg(&adap->dev, "succeeded\n");
        return 0;
 }