From: Michael Walle <michael@walle.cc>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Claudiu Manoil <claudiu.manoil@nxp.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Alex Marginean <alexandru.marginean@nxp.com>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
Michael Walle <michael@walle.cc>
Subject: [PATCH net-next 4/4] enetc: reorder macros and functions
Date: Tue, 15 Dec 2020 22:22:00 +0100 [thread overview]
Message-ID: <20201215212200.30915-5-michael@walle.cc> (raw)
In-Reply-To: <20201215212200.30915-1-michael@walle.cc>
Now that there aren't any more macros with parameters, move the macros
above any functions.
Signed-off-by: Michael Walle <michael@walle.cc>
---
.../net/ethernet/freescale/enetc/enetc_mdio.c | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_mdio.c b/drivers/net/ethernet/freescale/enetc/enetc_mdio.c
index 591b16f01507..70e6d97b380f 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_mdio.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_mdio.c
@@ -14,17 +14,6 @@
#define ENETC_MDIO_DATA 0x8 /* MDIO data */
#define ENETC_MDIO_ADDR 0xc /* MDIO address */
-static inline u32 enetc_mdio_rd(struct enetc_mdio_priv *mdio_priv, int off)
-{
- return enetc_port_rd_mdio(mdio_priv->hw, mdio_priv->mdio_base + off);
-}
-
-static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,
- u32 val)
-{
- enetc_port_wr_mdio(mdio_priv->hw, mdio_priv->mdio_base + off, val);
-}
-
#define MDIO_CFG_CLKDIV(x) ((((x) >> 1) & 0xff) << 8)
#define MDIO_CFG_BSY BIT(0)
#define MDIO_CFG_RD_ER BIT(1)
@@ -42,6 +31,17 @@ static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,
#define MDIO_CTL_PORT_ADDR(x) (((x) & 0x1f) << 5)
#define MDIO_CTL_READ BIT(15)
+static inline u32 enetc_mdio_rd(struct enetc_mdio_priv *mdio_priv, int off)
+{
+ return enetc_port_rd_mdio(mdio_priv->hw, mdio_priv->mdio_base + off);
+}
+
+static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,
+ u32 val)
+{
+ enetc_port_wr_mdio(mdio_priv->hw, mdio_priv->mdio_base + off, val);
+}
+
static bool enetc_mdio_is_busy(struct enetc_mdio_priv *mdio_priv)
{
return enetc_mdio_rd(mdio_priv, ENETC_MDIO_CFG) & MDIO_CFG_BSY;
--
2.20.1
next prev parent reply other threads:[~2020-12-15 21:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 21:21 [PATCH net-next 0/4] enetc: code cleanups Michael Walle
2020-12-15 21:21 ` [PATCH net-next 1/4] enetc: drop unneeded indirection Michael Walle
2020-12-16 2:31 ` Andrew Lunn
2020-12-16 19:20 ` Vladimir Oltean
2020-12-15 21:21 ` [PATCH net-next 2/4] enetc: don't use macro magic for the readx_poll_timeout() callback Michael Walle
2020-12-16 2:34 ` Andrew Lunn
2020-12-16 19:23 ` Vladimir Oltean
2020-12-15 21:21 ` [PATCH net-next 3/4] enetc: drop MDIO_DATA() macro Michael Walle
2020-12-16 2:42 ` Andrew Lunn
2020-12-16 19:24 ` Vladimir Oltean
2020-12-15 21:22 ` Michael Walle [this message]
2020-12-16 3:02 ` [PATCH net-next 4/4] enetc: reorder macros and functions Andrew Lunn
2020-12-16 19:24 ` Vladimir Oltean
2020-12-16 19:25 ` [PATCH net-next 0/4] enetc: code cleanups Vladimir Oltean
2020-12-16 19:33 ` Michael Walle
2020-12-16 23:45 ` Andrew Lunn
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=20201215212200.30915-5-michael@walle.cc \
--to=michael@walle.cc \
--cc=alexandru.marginean@nxp.com \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vladimir.oltean@nxp.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;
as well as URLs for NNTP newsgroup(s).