From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next 6/8] net: xpcs: remove xpcs_config_eee() from global scope
Date: Mon, 10 Feb 2025 10:54:05 +0000 [thread overview]
Message-ID: <E1thRQT-003w7O-Ec@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <Z6naiPpxfxGr1Ic6@shell.armlinux.org.uk>
Make xpcs_config_eee() private to the XPCS driver, called only from
the phylink pcs_disable_eee() and pcs_enable_eee() methods.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/pcs/pcs-xpcs.c | 14 ++++----------
include/linux/pcs/pcs-xpcs.h | 2 --
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 1f312b5589a3..6a28a4eae21c 100644
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -602,8 +602,8 @@ static void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces)
__set_bit(compat->interface, interfaces);
}
-static int __xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,
- int enable)
+static int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,
+ int enable)
{
u16 mask, val;
int ret;
@@ -632,12 +632,6 @@ static int __xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,
enable ? DW_VR_MII_EEE_TRN_LPI : 0);
}
-int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns, int enable)
-{
- return 0;
-}
-EXPORT_SYMBOL_GPL(xpcs_config_eee);
-
static void xpcs_pre_config(struct phylink_pcs *pcs, phy_interface_t interface)
{
struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);
@@ -1203,14 +1197,14 @@ static void xpcs_disable_eee(struct phylink_pcs *pcs)
{
struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);
- __xpcs_config_eee(xpcs, 0, false);
+ xpcs_config_eee(xpcs, 0, false);
}
static void xpcs_enable_eee(struct phylink_pcs *pcs)
{
struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);
- __xpcs_config_eee(xpcs, xpcs->eee_mult_fact, true);
+ xpcs_config_eee(xpcs, xpcs->eee_mult_fact, true);
}
/**
diff --git a/include/linux/pcs/pcs-xpcs.h b/include/linux/pcs/pcs-xpcs.h
index 749d40a9a086..e40f554ff717 100644
--- a/include/linux/pcs/pcs-xpcs.h
+++ b/include/linux/pcs/pcs-xpcs.h
@@ -50,8 +50,6 @@ struct dw_xpcs;
struct phylink_pcs *xpcs_to_phylink_pcs(struct dw_xpcs *xpcs);
int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface);
-int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,
- int enable);
void xpcs_config_eee_mult_fact(struct dw_xpcs *xpcs, u8 mult_fact);
struct dw_xpcs *xpcs_create_mdiodev(struct mii_bus *bus, int addr);
struct dw_xpcs *xpcs_create_fwnode(struct fwnode_handle *fwnode);
--
2.30.2
next prev parent reply other threads:[~2025-02-10 11:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-10 10:52 [PATCH net-next 0/8] net: phylink,xpcs,stmmac: support PCS EEE configuration Russell King (Oracle)
2025-02-10 10:53 ` [PATCH net-next 1/8] net: phylink: add support for notifying PCS about EEE Russell King (Oracle)
2025-02-10 10:53 ` [PATCH net-next 2/8] net: xpcs: add function to configure EEE clock multiplying factor Russell King (Oracle)
2025-02-10 10:53 ` [PATCH net-next 3/8] net: stmmac: call xpcs_config_eee_mult_fact() Russell King (Oracle)
2025-02-10 10:53 ` [PATCH net-next 4/8] net: xpcs: convert to phylink managed EEE Russell King (Oracle)
2025-02-10 10:54 ` [PATCH net-next 5/8] net: stmmac: remove calls to xpcs_config_eee() Russell King (Oracle)
2025-02-10 10:54 ` Russell King (Oracle) [this message]
2025-02-10 10:54 ` [PATCH net-next 7/8] net: xpcs: clean up xpcs_config_eee() Russell King (Oracle)
2025-02-10 10:54 ` [PATCH net-next 8/8] net: xpcs: group EEE code together Russell King (Oracle)
2025-02-14 21:50 ` [PATCH net-next 0/8] net: phylink,xpcs,stmmac: support PCS EEE configuration patchwork-bot+netdevbpf
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=E1thRQT-003w7O-Ec@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.