mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -04: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>
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Bcc: linux@mail.armlinux.org.uk
|
|
Cc: linux-i2c@vger.kernel.org
|
|
Subject: [PATCH 11/17] i2c: pxa: clean up decode_bits()
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Clean up decode_bits() to use pr_cont(), and move the newline into the
|
|
function rather than at its two callsites. Avoid printing an
|
|
unnecessary space before the newline.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/i2c/busses/i2c-pxa.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-pxa.c
|
|
+++ b/drivers/i2c/busses/i2c-pxa.c
|
|
@@ -287,13 +287,14 @@ struct bits {
|
|
static inline void
|
|
decode_bits(const char *prefix, const struct bits *bits, int num, u32 val)
|
|
{
|
|
- printk("%s %08x: ", prefix, val);
|
|
+ printk("%s %08x:", prefix, val);
|
|
while (num--) {
|
|
const char *str = val & bits->mask ? bits->set : bits->unset;
|
|
if (str)
|
|
- printk("%s ", str);
|
|
+ pr_cont(" %s", str);
|
|
bits++;
|
|
}
|
|
+ pr_cont("\n");
|
|
}
|
|
|
|
static const struct bits isr_bits[] = {
|
|
@@ -313,7 +314,6 @@ static const struct bits isr_bits[] = {
|
|
static void decode_ISR(unsigned int val)
|
|
{
|
|
decode_bits(KERN_DEBUG "ISR", isr_bits, ARRAY_SIZE(isr_bits), val);
|
|
- printk("\n");
|
|
}
|
|
|
|
static const struct bits icr_bits[] = {
|
|
@@ -338,7 +338,6 @@ static const struct bits icr_bits[] = {
|
|
static void decode_ICR(unsigned int val)
|
|
{
|
|
decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val);
|
|
- printk("\n");
|
|
}
|
|
#endif
|
|
|