mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-30 22:50:54 -04:00
net: stmmac: remove pcs_rane() method
The pcs_rane() method is not called, so lets just remove this redundant code. Reviewed-by: Andrew Halaney <ahalaney@redhat.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Serge Semin <fancer.lancer@gmail.com> Link: https://lore.kernel.org/r/E1sCErU-00EOPr-MC@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
4af90c0f48
commit
3277407e5e
@@ -404,11 +404,6 @@ static void dwmac1000_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral,
|
||||
dwmac_ctrl_ane(ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);
|
||||
}
|
||||
|
||||
static void dwmac1000_rane(void __iomem *ioaddr, bool restart)
|
||||
{
|
||||
dwmac_rane(ioaddr, GMAC_PCS_BASE, restart);
|
||||
}
|
||||
|
||||
static void dwmac1000_get_adv_lp(void __iomem *ioaddr, struct rgmii_adv *adv)
|
||||
{
|
||||
dwmac_get_adv_lp(ioaddr, GMAC_PCS_BASE, adv);
|
||||
@@ -519,7 +514,6 @@ const struct stmmac_ops dwmac1000_ops = {
|
||||
.set_eee_pls = dwmac1000_set_eee_pls,
|
||||
.debug = dwmac1000_debug,
|
||||
.pcs_ctrl_ane = dwmac1000_ctrl_ane,
|
||||
.pcs_rane = dwmac1000_rane,
|
||||
.pcs_get_adv_lp = dwmac1000_get_adv_lp,
|
||||
.set_mac_loopback = dwmac1000_set_mac_loopback,
|
||||
};
|
||||
|
||||
@@ -758,11 +758,6 @@ static void dwmac4_ctrl_ane(void __iomem *ioaddr, bool ane, bool srgmi_ral,
|
||||
dwmac_ctrl_ane(ioaddr, GMAC_PCS_BASE, ane, srgmi_ral, loopback);
|
||||
}
|
||||
|
||||
static void dwmac4_rane(void __iomem *ioaddr, bool restart)
|
||||
{
|
||||
dwmac_rane(ioaddr, GMAC_PCS_BASE, restart);
|
||||
}
|
||||
|
||||
static void dwmac4_get_adv_lp(void __iomem *ioaddr, struct rgmii_adv *adv)
|
||||
{
|
||||
dwmac_get_adv_lp(ioaddr, GMAC_PCS_BASE, adv);
|
||||
@@ -1215,7 +1210,6 @@ const struct stmmac_ops dwmac4_ops = {
|
||||
.set_eee_timer = dwmac4_set_eee_timer,
|
||||
.set_eee_pls = dwmac4_set_eee_pls,
|
||||
.pcs_ctrl_ane = dwmac4_ctrl_ane,
|
||||
.pcs_rane = dwmac4_rane,
|
||||
.pcs_get_adv_lp = dwmac4_get_adv_lp,
|
||||
.debug = dwmac4_debug,
|
||||
.set_filter = dwmac4_set_filter,
|
||||
@@ -1260,7 +1254,6 @@ const struct stmmac_ops dwmac410_ops = {
|
||||
.set_eee_timer = dwmac4_set_eee_timer,
|
||||
.set_eee_pls = dwmac4_set_eee_pls,
|
||||
.pcs_ctrl_ane = dwmac4_ctrl_ane,
|
||||
.pcs_rane = dwmac4_rane,
|
||||
.pcs_get_adv_lp = dwmac4_get_adv_lp,
|
||||
.debug = dwmac4_debug,
|
||||
.set_filter = dwmac4_set_filter,
|
||||
@@ -1309,7 +1302,6 @@ const struct stmmac_ops dwmac510_ops = {
|
||||
.set_eee_timer = dwmac4_set_eee_timer,
|
||||
.set_eee_pls = dwmac4_set_eee_pls,
|
||||
.pcs_ctrl_ane = dwmac4_ctrl_ane,
|
||||
.pcs_rane = dwmac4_rane,
|
||||
.pcs_get_adv_lp = dwmac4_get_adv_lp,
|
||||
.debug = dwmac4_debug,
|
||||
.set_filter = dwmac4_set_filter,
|
||||
|
||||
@@ -370,7 +370,6 @@ struct stmmac_ops {
|
||||
/* PCS calls */
|
||||
void (*pcs_ctrl_ane)(void __iomem *ioaddr, bool ane, bool srgmi_ral,
|
||||
bool loopback);
|
||||
void (*pcs_rane)(void __iomem *ioaddr, bool restart);
|
||||
void (*pcs_get_adv_lp)(void __iomem *ioaddr, struct rgmii_adv *adv);
|
||||
/* Safety Features */
|
||||
int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp,
|
||||
@@ -484,8 +483,6 @@ struct stmmac_ops {
|
||||
stmmac_do_void_callback(__priv, mac, debug, __priv, __args)
|
||||
#define stmmac_pcs_ctrl_ane(__priv, __args...) \
|
||||
stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __args)
|
||||
#define stmmac_pcs_rane(__priv, __args...) \
|
||||
stmmac_do_void_callback(__priv, mac, pcs_rane, __priv, __args)
|
||||
#define stmmac_pcs_get_adv_lp(__priv, __args...) \
|
||||
stmmac_do_void_callback(__priv, mac, pcs_get_adv_lp, __args)
|
||||
#define stmmac_safety_feat_config(__priv, __args...) \
|
||||
|
||||
@@ -74,23 +74,6 @@ static inline void dwmac_pcs_isr(void __iomem *ioaddr, u32 reg,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* dwmac_rane - To restart ANE
|
||||
* @ioaddr: IO registers pointer
|
||||
* @reg: Base address of the AN Control Register.
|
||||
* @restart: to restart ANE
|
||||
* Description: this is to just restart the Auto-Negotiation.
|
||||
*/
|
||||
static inline void dwmac_rane(void __iomem *ioaddr, u32 reg, bool restart)
|
||||
{
|
||||
u32 value = readl(ioaddr + GMAC_AN_CTRL(reg));
|
||||
|
||||
if (restart)
|
||||
value |= GMAC_AN_CTRL_RAN;
|
||||
|
||||
writel(value, ioaddr + GMAC_AN_CTRL(reg));
|
||||
}
|
||||
|
||||
/**
|
||||
* dwmac_ctrl_ane - To program the AN Control Register.
|
||||
* @ioaddr: IO registers pointer
|
||||
|
||||
Reference in New Issue
Block a user