55be1c3734
All modifications made by by update_kernel.sh.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800 [only 5.4.107]
No dmesg regressions, everything functional
Run-tested by @timocapa:
- ramips/mt7621/{Xiaomi R3G, Redmi 2100}
- Lantiq/XWAY/Fritz!Box 7320/7330
Signed-off-by: John Audia <graysky@archlinux.us>
[squash, edit commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 3b33438c52def0de4a5577ad541e50923bcc2596 Mon Sep 17 00:00:00 2001
|
|
From: Paul Barker <pbarker@konsulko.com>
|
|
Date: Thu, 3 Sep 2020 12:26:20 +0100
|
|
Subject: [PATCH] net: dsa: b53: Use dev_{err,info} instead of pr_*
|
|
|
|
This change allows us to see which device the err or info messages are
|
|
referring to if we have multiple b53 compatible devices on a board.
|
|
|
|
As this removes the only pr_*() calls in this file we can drop the
|
|
definition of pr_fmt().
|
|
|
|
Signed-off-by: Paul Barker <pbarker@konsulko.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/b53/b53_common.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
@@ -17,8 +17,6 @@
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
-
|
|
#include <linux/delay.h>
|
|
#include <linux/export.h>
|
|
#include <linux/gpio.h>
|
|
@@ -2476,8 +2474,9 @@ int b53_switch_detect(struct b53_device
|
|
dev->chip_id = id32;
|
|
break;
|
|
default:
|
|
- pr_err("unsupported switch detected (BCM53%02x/BCM%x)\n",
|
|
- id8, id32);
|
|
+ dev_err(dev->dev,
|
|
+ "unsupported switch detected (BCM53%02x/BCM%x)\n",
|
|
+ id8, id32);
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
@@ -2507,7 +2506,8 @@ int b53_switch_register(struct b53_devic
|
|
if (ret)
|
|
return ret;
|
|
|
|
- pr_info("found switch: %s, rev %i\n", dev->name, dev->core_rev);
|
|
+ dev_info(dev->dev, "found switch: %s, rev %i\n",
|
|
+ dev->name, dev->core_rev);
|
|
|
|
return dsa_register_switch(dev->ds);
|
|
}
|