i2c: Fix platform driver hotplug/coldplug

[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 03188d277af1e2ef32c1cfca6cf1aa710502ebeb..63b3e2c11cff1a17ac67b2b21b39d49851c5143a 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,
@@ -467,7 +467,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
            (cmd->read_len == 0 || cmd->write_len == 0))) {
                dev_err(&pmcmsptwi_adapter.dev,
                        "%s: Cannot transfer less than 1 byte\n",
-                       __FUNCTION__);
+                       __func__);
                return -EINVAL;
        }
 
@@ -475,7 +475,7 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
            cmd->write_len > MSP_MAX_BYTES_PER_RW) {
                dev_err(&pmcmsptwi_adapter.dev,
                        "%s: Cannot transfer more than %d bytes\n",
-                       __FUNCTION__, MSP_MAX_BYTES_PER_RW);
+                       __func__, MSP_MAX_BYTES_PER_RW);
                return -EINVAL;
        }
 
@@ -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;
 }
 
@@ -627,10 +627,13 @@ static struct i2c_adapter pmcmsptwi_adapter = {
        .name           = DRV_NAME,
 };
 
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:" DRV_NAME);
+
 static struct platform_driver pmcmsptwi_driver = {
        .probe  = pmcmsptwi_probe,
        .remove = __devexit_p(pmcmsptwi_remove),
-       .driver {
+       .driver = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
        },