kernel: drop backported gpio emulated open drain output fix

[openwrt/staging/hauke.git] / target / linux / generic / backport-5.4 / 817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch

diff --git a/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch b/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch
index 39ca935ae9349f79c38706f7c96ce667eeffda52..24cda47789c6fc7f0724f9f6e1087a53c644ca40 100644 (file)
--- a/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch
+++ b/target/linux/generic/backport-5.4/817-v5.8-i2c-pxa-ensure-timeout-messages-are-unique.patch
@@ -14,11 +14,9 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  drivers/i2c/busses/i2c-pxa.c | 6 +++---
  1 file 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)
+@@ -1054,7 +1054,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2
        ret = i2c->msg_idx;
  
        if (!timeout && i2c->msg_num) {
@@ -27,7 +25,7 @@ index f20f8b905793..0becab239476 100644
                ret = I2C_RETRY;
        }
  
-@@ -1169,7 +1169,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c)
+@@ -1124,7 +1124,7 @@ static int i2c_pxa_pio_set_master(struct
        if (timeout < 0) {
                show_state(i2c);
                dev_err(&i2c->adap.dev,
@@ -36,7 +34,7 @@ index f20f8b905793..0becab239476 100644
                return I2C_RETRY;
        }
  
-@@ -1213,7 +1213,7 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c,
+@@ -1168,7 +1168,7 @@ static int i2c_pxa_do_pio_xfer(struct px
  
  out:
        if (timeout == 0) {
@@ -45,6 +43,3 @@ index f20f8b905793..0becab239476 100644
                ret = I2C_RETRY;
        }
  
--- 
-2.20.1
-