From: David Yang <mmyangfl@gmail.com>
To: netdev@vger.kernel.org
Cc: David Yang <mmyangfl@gmail.com>, Andrew Lunn <andrew@lunn.ch>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next 1/3] net: dsa: yt921x: Refactor port error message
Date: Wed, 4 Feb 2026 01:12:41 +0800 [thread overview]
Message-ID: <20260203171305.95085-2-mmyangfl@gmail.com> (raw)
In-Reply-To: <20260203171305.95085-1-mmyangfl@gmail.com>
Sometimes we might get error from the underlying bus, but the return
type of the function is void, so an error message is desired. There are
many instances of the same pattern, refactor it.
Signed-off-by: David Yang <mmyangfl@gmail.com>
---
drivers/net/dsa/yt921x.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c
index 98e8915dd6c2..ce2878ef9b24 100644
--- a/drivers/net/dsa/yt921x.c
+++ b/drivers/net/dsa/yt921x.c
@@ -185,6 +185,9 @@ struct yt921x_reg_mdio {
#define to_yt921x_priv(_ds) container_of_const(_ds, struct yt921x_priv, ds)
#define to_device(priv) ((priv)->ds.dev)
+#define print_port_err(dev, port, res, action) dev_err( \
+ (dev), "Failed to %s port %d: %i\n", (action), (port), (res))
+
static int yt921x_reg_read(struct yt921x_priv *priv, u32 reg, u32 *valp)
{
WARN_ON(!mutex_is_locked(&priv->reg_lock));
@@ -721,8 +724,7 @@ static int yt921x_read_mib(struct yt921x_priv *priv, int port)
mib->tx_jumbo;
if (res)
- dev_err(dev, "Failed to %s port %d: %i\n", "read stats for",
- port, res);
+ print_port_err(dev, port, res, "read stats for");
return res;
}
@@ -1102,8 +1104,7 @@ yt921x_dsa_port_mirror_del(struct dsa_switch *ds, int port,
mutex_unlock(&priv->reg_lock);
if (res)
- dev_err(dev, "Failed to %s port %d: %i\n", "unmirror",
- port, res);
+ print_port_err(dev, port, res, "unmirror");
}
static int
@@ -1690,8 +1691,7 @@ static void yt921x_dsa_port_fast_age(struct dsa_switch *ds, int port)
mutex_unlock(&priv->reg_lock);
if (res)
- dev_err(dev, "Failed to %s port %d: %i\n", "clear FDB for",
- port, res);
+ print_port_err(dev, port, res, "clear FDB for");
}
static int
@@ -2266,8 +2266,7 @@ yt921x_dsa_port_bridge_leave(struct dsa_switch *ds, int port,
mutex_unlock(&priv->reg_lock);
if (res)
- dev_err(dev, "Failed to %s port %d: %i\n", "unbridge",
- port, res);
+ print_port_err(dev, port, res, "unbridge");
}
static int
@@ -2399,8 +2398,7 @@ yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
mutex_unlock(&priv->reg_lock);
if (res)
- dev_err(dev, "Failed to %s port %d: %i\n", "set STP state for",
- port, res);
+ print_port_err(dev, port, res, "set STP state for");
}
static int __maybe_unused
@@ -2738,8 +2736,7 @@ yt921x_phylink_mac_link_down(struct phylink_config *config, unsigned int mode,
mutex_unlock(&priv->reg_lock);
if (res)
- dev_err(dp->ds->dev, "Failed to %s port %d: %i\n", "bring down",
- port, res);
+ print_port_err(dp->ds->dev, port, res, "bring down");
}
static void
@@ -2759,8 +2756,7 @@ yt921x_phylink_mac_link_up(struct phylink_config *config,
mutex_unlock(&priv->reg_lock);
if (res)
- dev_err(dp->ds->dev, "Failed to %s port %d: %i\n", "bring up",
- port, res);
+ print_port_err(dp->ds->dev, port, res, "bring up");
schedule_delayed_work(&priv->ports[port].mib_read, 0);
}
@@ -2779,8 +2775,7 @@ yt921x_phylink_mac_config(struct phylink_config *config, unsigned int mode,
mutex_unlock(&priv->reg_lock);
if (res)
- dev_err(dp->ds->dev, "Failed to %s port %d: %i\n", "config",
- port, res);
+ print_port_err(dp->ds->dev, port, res, "config");
}
static void
--
2.51.0
next prev parent reply other threads:[~2026-02-03 17:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-03 17:12 [PATCH net-next 0/3] net: dsa: yt921x: Use u64_stats_t for MIB stats David Yang
2026-02-03 17:12 ` David Yang [this message]
2026-02-05 5:07 ` [PATCH net-next 1/3] net: dsa: yt921x: Refactor port error message Jakub Kicinski
2026-02-03 17:12 ` [PATCH net-next 2/3] net: dsa: yt921x: Return early for failed MIB read David Yang
2026-02-05 5:08 ` [net-next,2/3] " Jakub Kicinski
2026-02-03 17:12 ` [PATCH net-next 3/3] net: dsa: yt921x: Use u64_stats_t for MIB stats David Yang
2026-02-05 5:12 ` Jakub Kicinski
2026-02-05 5:32 ` David Yang
2026-02-05 15:39 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260203171305.95085-2-mmyangfl@gmail.com \
--to=mmyangfl@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox