aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-pmcmsp.c8
-rw-r--r--drivers/i2c/busses/i2c-pnx.c2
-rw-r--r--drivers/i2c/chips/menelaus.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index 17cecf1ea797..be99c02ecac5 100644
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -591,18 +591,18 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,
591 if (msg->flags & I2C_M_TEN) 591 if (msg->flags & I2C_M_TEN)
592 pmcmsptwi_set_twi_config(&oldcfg, data); 592 pmcmsptwi_set_twi_config(&oldcfg, data);
593 593
594 dev_dbg(&adap->dev, "I2C %s of %d bytes ", 594 dev_dbg(&adap->dev, "I2C %s of %d bytes %s\n",
595 (msg->flags & I2C_M_RD) ? "read" : "write", msg->len); 595 (msg->flags & I2C_M_RD) ? "read" : "write", msg->len,
596 (ret == MSP_TWI_XFER_OK) ? "succeeded" : "failed");
597
596 if (ret != MSP_TWI_XFER_OK) { 598 if (ret != MSP_TWI_XFER_OK) {
597 /* 599 /*
598 * TODO: We could potentially loop and retry in the case 600 * TODO: We could potentially loop and retry in the case
599 * of MSP_TWI_XFER_TIMEOUT. 601 * of MSP_TWI_XFER_TIMEOUT.
600 */ 602 */
601 dev_dbg(&adap->dev, "failed\n");
602 return -1; 603 return -1;
603 } 604 }
604 605
605 dev_dbg(&adap->dev, "succeeded\n");
606 return 0; 606 return 0;
607} 607}
608 608
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 17376feb1acc..f8d0dff0de7e 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -575,7 +575,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
575 else { 575 else {
576 freq_mhz = PNX_DEFAULT_FREQ; 576 freq_mhz = PNX_DEFAULT_FREQ;
577 dev_info(&pdev->dev, "Setting bus frequency to default value: " 577 dev_info(&pdev->dev, "Setting bus frequency to default value: "
578 "%d MHz", freq_mhz); 578 "%d MHz\n", freq_mhz);
579 } 579 }
580 580
581 i2c_pnx->adapter->algo = &pnx_algorithm; 581 i2c_pnx->adapter->algo = &pnx_algorithm;
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 66436bae11ac..2dea0123a958 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -1195,7 +1195,7 @@ static int menelaus_probe(struct i2c_client *client)
1195 err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED, 1195 err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED,
1196 DRIVER_NAME, menelaus); 1196 DRIVER_NAME, menelaus);
1197 if (err) { 1197 if (err) {
1198 dev_dbg(&client->dev, "can't get IRQ %d, err %d", 1198 dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
1199 client->irq, err); 1199 client->irq, err);
1200 goto fail1; 1200 goto fail1;
1201 } 1201 }