target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch

   1 From: Russell King <rmk+kernel@armlinux.org.uk>
   2 Bcc: linux@mail.armlinux.org.uk
   3 Subject: [PATCH 3/7] i2c: pxa: ensure timeout messages are unique
   4 MIME-Version: 1.0
   5 Content-Disposition: inline
   6 Content-Transfer-Encoding: 8bit
   7 Content-Type: text/plain; charset="utf-8"
   8
   9 Ensure that the various timeout messages can identify where in the code
  10 they were produced from to aid debugging.
  11
  12 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  13 ---
  14  drivers/i2c/busses/i2c-pxa.c | 6 +++---
  15  1 file changed, 3 insertions(+), 3 deletions(-)
  16
  17 diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
  18 index f20f8b905793..0becab239476 100644
  19 --- a/drivers/i2c/busses/i2c-pxa.c
  20 +++ b/drivers/i2c/busses/i2c-pxa.c
  21 @@ -1095,7 +1095,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num)
  22         ret = i2c->msg_idx;
  23
  24         if (!timeout && i2c->msg_num) {
  25 -               i2c_pxa_scream_blue_murder(i2c, "timeout");
  26 +               i2c_pxa_scream_blue_murder(i2c, "timeout with active message");
  27                 ret = I2C_RETRY;
  28         }
  29
  30 @@ -1169,7 +1169,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c)
  31         if (timeout < 0) {
  32                 show_state(i2c);
  33                 dev_err(&i2c->adap.dev,
  34 -                       "i2c_pxa: timeout waiting for bus free\n");
  35 +                       "i2c_pxa: timeout waiting for bus free (set_master)\n");
  36                 return I2C_RETRY;
  37         }
  38
  39 @@ -1213,7 +1213,7 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c,
  40
  41  out:
  42         if (timeout == 0) {
  43 -               i2c_pxa_scream_blue_murder(i2c, "timeout");
  44 +               i2c_pxa_scream_blue_murder(i2c, "timeout (do_pio_xfer)");
  45                 ret = I2C_RETRY;
  46         }
  47
  48 --
  49 2.20.1
  50