mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-02 20:16:59 +00:00
807366af38
This patch has been backported to stable kernel 5.4 already. Remove our local patch explicitly now, as by applying the patch (or refreshing) the relevant code is actually added a second time. Refresh remaining patches as well. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Bcc: linux@mail.armlinux.org.uk
|
|
Subject: [PATCH 4/7] i2c: pxa: remove some unnecessary debug
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Remove unnecessary show_state() in the loop inside
|
|
i2c_pxa_pio_set_master(), which can be unnecessarily verbose.
|
|
|
|
Remove the i2c_pxa_scream_blue_murder() in i2c_pxa_pio_xfer(), which
|
|
will trigger if we are probing the I2C bus and a slave does not
|
|
respond; this is a normal event, and not something to report.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/i2c/busses/i2c-pxa.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-pxa.c
|
|
+++ b/drivers/i2c/busses/i2c-pxa.c
|
|
@@ -1116,10 +1116,8 @@ static int i2c_pxa_pio_set_master(struct
|
|
/*
|
|
* Wait for the bus to become free.
|
|
*/
|
|
- while (timeout-- && readl(_ISR(i2c)) & (ISR_IBB | ISR_UB)) {
|
|
+ while (timeout-- && readl(_ISR(i2c)) & (ISR_IBB | ISR_UB))
|
|
udelay(1000);
|
|
- show_state(i2c);
|
|
- }
|
|
|
|
if (timeout < 0) {
|
|
show_state(i2c);
|