aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-01-13 11:01:13 +0100
committerRafał Miłecki <rafal@milecki.pl>2021-01-13 11:28:41 +0100
commit7e4f055990cf1d84dc1ea512fc421b2f68b346e7 (patch)
tree79ef5b0a48661a6b8b02a3f28cf358a1f777ded4 /target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch
parent56d64d8b5a47a2ce076661564c696445a5721338 (diff)
downloadupstream-7e4f055990cf1d84dc1ea512fc421b2f68b346e7.tar.gz
upstream-7e4f055990cf1d84dc1ea512fc421b2f68b346e7.tar.bz2
upstream-7e4f055990cf1d84dc1ea512fc421b2f68b346e7.zip
bcm4908: backport BCM4908 integrated switch initial support
Upstream driver supports bridging ports. There is no support for crossbar setup or CPU port(s) yet. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch')
-rw-r--r--target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch b/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch
new file mode 100644
index 0000000000..1786066a23
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch
@@ -0,0 +1,50 @@
+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>
+@@ -2458,8 +2456,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;
+ }
+ }
+@@ -2489,7 +2488,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);
+ }