Commit ae1c3b73 authored by Russell King's avatar Russell King Committed by Wolfram Sang
Browse files

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent c25e509a

drivers/i2c/busses/i2c-pxa.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}