summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2020-05-11 23:10:37 +0200
committerWolfram Sang <wsa@kernel.org>2020-05-12 12:32:44 +0200
commitae1c3b73945cadb59af1cbf31bc8105d2014ef90 (patch)
tree6a3293047f79e5f882899d2e93eddb9a60d2f523 /drivers/i2c/busses
parenti2c: pxa: avoid complaints with non-responsive slaves (diff)
downloadlinux-ae1c3b73945cadb59af1cbf31bc8105d2014ef90.tar.xz
linux-ae1c3b73945cadb59af1cbf31bc8105d2014ef90.zip
i2c: pxa: ensure timeout messages are unique
Ensure that the various timeout messages can identify where in the code they were produced from to aid debugging. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-pxa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index f20f8b905793..0becab239476 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1095,7 +1095,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num)
ret = i2c->msg_idx;
if (!timeout && i2c->msg_num) {
- i2c_pxa_scream_blue_murder(i2c, "timeout");
+ i2c_pxa_scream_blue_murder(i2c, "timeout with active message");
ret = I2C_RETRY;
}
@@ -1169,7 +1169,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c)
if (timeout < 0) {
show_state(i2c);
dev_err(&i2c->adap.dev,
- "i2c_pxa: timeout waiting for bus free\n");
+ "i2c_pxa: timeout waiting for bus free (set_master)\n");
return I2C_RETRY;
}
@@ -1213,7 +1213,7 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c,
out:
if (timeout == 0) {
- i2c_pxa_scream_blue_murder(i2c, "timeout");
+ i2c_pxa_scream_blue_murder(i2c, "timeout (do_pio_xfer)");
ret = I2C_RETRY;
}