mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-07 23:20:32 -04:00
net: stmmac: remove old EEE methods
As we no longer call the set_eee_mode(), reset_eee_mode() and set_eee_lpi_entry_timer() methods, remove these and their glue in common.h Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/E1tffe7-003ZIm-Qv@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
305a0f68cf
commit
62b0a039ca
@@ -362,17 +362,6 @@ static int dwmac1000_set_lpi_mode(struct mac_device_info *hw,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dwmac1000_set_eee_mode(struct mac_device_info *hw,
|
||||
bool en_tx_lpi_clockgating)
|
||||
{
|
||||
dwmac1000_set_lpi_mode(hw, STMMAC_LPI_FORCED, en_tx_lpi_clockgating, 0);
|
||||
}
|
||||
|
||||
static void dwmac1000_reset_eee_mode(struct mac_device_info *hw)
|
||||
{
|
||||
dwmac1000_set_lpi_mode(hw, STMMAC_LPI_DISABLE, false, 0);
|
||||
}
|
||||
|
||||
static void dwmac1000_set_eee_pls(struct mac_device_info *hw, int link)
|
||||
{
|
||||
void __iomem *ioaddr = hw->pcsr;
|
||||
@@ -514,8 +503,6 @@ const struct stmmac_ops dwmac1000_ops = {
|
||||
.set_umac_addr = dwmac1000_set_umac_addr,
|
||||
.get_umac_addr = dwmac1000_get_umac_addr,
|
||||
.set_lpi_mode = dwmac1000_set_lpi_mode,
|
||||
.set_eee_mode = dwmac1000_set_eee_mode,
|
||||
.reset_eee_mode = dwmac1000_reset_eee_mode,
|
||||
.set_eee_timer = dwmac1000_set_eee_timer,
|
||||
.set_eee_pls = dwmac1000_set_eee_pls,
|
||||
.debug = dwmac1000_debug,
|
||||
|
||||
@@ -418,21 +418,6 @@ static int dwmac4_set_lpi_mode(struct mac_device_info *hw,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dwmac4_set_eee_mode(struct mac_device_info *hw,
|
||||
bool en_tx_lpi_clockgating)
|
||||
{
|
||||
/* Enable the link status receive on RGMII, SGMII ore SMII
|
||||
* receive path and instruct the transmit to enter in LPI
|
||||
* state.
|
||||
*/
|
||||
dwmac4_set_lpi_mode(hw, STMMAC_LPI_FORCED, en_tx_lpi_clockgating, 0);
|
||||
}
|
||||
|
||||
static void dwmac4_reset_eee_mode(struct mac_device_info *hw)
|
||||
{
|
||||
dwmac4_set_lpi_mode(hw, STMMAC_LPI_DISABLE, false, 0);
|
||||
}
|
||||
|
||||
static void dwmac4_set_eee_pls(struct mac_device_info *hw, int link)
|
||||
{
|
||||
void __iomem *ioaddr = hw->pcsr;
|
||||
@@ -448,11 +433,6 @@ static void dwmac4_set_eee_pls(struct mac_device_info *hw, int link)
|
||||
writel(value, ioaddr + GMAC4_LPI_CTRL_STATUS);
|
||||
}
|
||||
|
||||
static void dwmac4_set_eee_lpi_entry_timer(struct mac_device_info *hw, u32 et)
|
||||
{
|
||||
dwmac4_set_lpi_mode(hw, STMMAC_LPI_TIMER, false, et & STMMAC_ET_MAX);
|
||||
}
|
||||
|
||||
static void dwmac4_set_eee_timer(struct mac_device_info *hw, int ls, int tw)
|
||||
{
|
||||
void __iomem *ioaddr = hw->pcsr;
|
||||
@@ -1214,9 +1194,6 @@ const struct stmmac_ops dwmac4_ops = {
|
||||
.set_umac_addr = dwmac4_set_umac_addr,
|
||||
.get_umac_addr = dwmac4_get_umac_addr,
|
||||
.set_lpi_mode = dwmac4_set_lpi_mode,
|
||||
.set_eee_mode = dwmac4_set_eee_mode,
|
||||
.reset_eee_mode = dwmac4_reset_eee_mode,
|
||||
.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,
|
||||
.set_eee_timer = dwmac4_set_eee_timer,
|
||||
.set_eee_pls = dwmac4_set_eee_pls,
|
||||
.pcs_ctrl_ane = dwmac4_ctrl_ane,
|
||||
@@ -1259,9 +1236,6 @@ const struct stmmac_ops dwmac410_ops = {
|
||||
.set_umac_addr = dwmac4_set_umac_addr,
|
||||
.get_umac_addr = dwmac4_get_umac_addr,
|
||||
.set_lpi_mode = dwmac4_set_lpi_mode,
|
||||
.set_eee_mode = dwmac4_set_eee_mode,
|
||||
.reset_eee_mode = dwmac4_reset_eee_mode,
|
||||
.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,
|
||||
.set_eee_timer = dwmac4_set_eee_timer,
|
||||
.set_eee_pls = dwmac4_set_eee_pls,
|
||||
.pcs_ctrl_ane = dwmac4_ctrl_ane,
|
||||
@@ -1306,9 +1280,6 @@ const struct stmmac_ops dwmac510_ops = {
|
||||
.set_umac_addr = dwmac4_set_umac_addr,
|
||||
.get_umac_addr = dwmac4_get_umac_addr,
|
||||
.set_lpi_mode = dwmac4_set_lpi_mode,
|
||||
.set_eee_mode = dwmac4_set_eee_mode,
|
||||
.reset_eee_mode = dwmac4_reset_eee_mode,
|
||||
.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,
|
||||
.set_eee_timer = dwmac4_set_eee_timer,
|
||||
.set_eee_pls = dwmac4_set_eee_pls,
|
||||
.pcs_ctrl_ane = dwmac4_ctrl_ane,
|
||||
|
||||
@@ -449,17 +449,6 @@ static int dwxgmac2_set_lpi_mode(struct mac_device_info *hw,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dwxgmac2_set_eee_mode(struct mac_device_info *hw,
|
||||
bool en_tx_lpi_clockgating)
|
||||
{
|
||||
dwxgmac2_set_lpi_mode(hw, STMMAC_LPI_FORCED, en_tx_lpi_clockgating, 0);
|
||||
}
|
||||
|
||||
static void dwxgmac2_reset_eee_mode(struct mac_device_info *hw)
|
||||
{
|
||||
dwxgmac2_set_lpi_mode(hw, STMMAC_LPI_DISABLE, false, 0);
|
||||
}
|
||||
|
||||
static void dwxgmac2_set_eee_pls(struct mac_device_info *hw, int link)
|
||||
{
|
||||
void __iomem *ioaddr = hw->pcsr;
|
||||
@@ -1536,8 +1525,6 @@ const struct stmmac_ops dwxgmac210_ops = {
|
||||
.set_umac_addr = dwxgmac2_set_umac_addr,
|
||||
.get_umac_addr = dwxgmac2_get_umac_addr,
|
||||
.set_lpi_mode = dwxgmac2_set_lpi_mode,
|
||||
.set_eee_mode = dwxgmac2_set_eee_mode,
|
||||
.reset_eee_mode = dwxgmac2_reset_eee_mode,
|
||||
.set_eee_timer = dwxgmac2_set_eee_timer,
|
||||
.set_eee_pls = dwxgmac2_set_eee_pls,
|
||||
.debug = NULL,
|
||||
@@ -1594,8 +1581,6 @@ const struct stmmac_ops dwxlgmac2_ops = {
|
||||
.set_umac_addr = dwxgmac2_set_umac_addr,
|
||||
.get_umac_addr = dwxgmac2_get_umac_addr,
|
||||
.set_lpi_mode = dwxgmac2_set_lpi_mode,
|
||||
.set_eee_mode = dwxgmac2_set_eee_mode,
|
||||
.reset_eee_mode = dwxgmac2_reset_eee_mode,
|
||||
.set_eee_timer = dwxgmac2_set_eee_timer,
|
||||
.set_eee_pls = dwxgmac2_set_eee_pls,
|
||||
.debug = NULL,
|
||||
|
||||
@@ -369,10 +369,6 @@ struct stmmac_ops {
|
||||
int (*set_lpi_mode)(struct mac_device_info *hw,
|
||||
enum stmmac_lpi_mode mode,
|
||||
bool en_tx_lpi_clockgating, u32 et);
|
||||
void (*set_eee_mode)(struct mac_device_info *hw,
|
||||
bool en_tx_lpi_clockgating);
|
||||
void (*reset_eee_mode)(struct mac_device_info *hw);
|
||||
void (*set_eee_lpi_entry_timer)(struct mac_device_info *hw, u32 et);
|
||||
void (*set_eee_timer)(struct mac_device_info *hw, int ls, int tw);
|
||||
void (*set_eee_pls)(struct mac_device_info *hw, int link);
|
||||
void (*debug)(struct stmmac_priv *priv, void __iomem *ioaddr,
|
||||
@@ -478,12 +474,6 @@ struct stmmac_ops {
|
||||
stmmac_do_void_callback(__priv, mac, get_umac_addr, __args)
|
||||
#define stmmac_set_lpi_mode(__priv, __args...) \
|
||||
stmmac_do_callback(__priv, mac, set_lpi_mode, __args)
|
||||
#define stmmac_set_eee_mode(__priv, __args...) \
|
||||
stmmac_do_void_callback(__priv, mac, set_eee_mode, __args)
|
||||
#define stmmac_reset_eee_mode(__priv, __args...) \
|
||||
stmmac_do_void_callback(__priv, mac, reset_eee_mode, __args)
|
||||
#define stmmac_set_eee_lpi_timer(__priv, __args...) \
|
||||
stmmac_do_void_callback(__priv, mac, set_eee_lpi_entry_timer, __args)
|
||||
#define stmmac_set_eee_timer(__priv, __args...) \
|
||||
stmmac_do_void_callback(__priv, mac, set_eee_timer, __args)
|
||||
#define stmmac_set_eee_pls(__priv, __args...) \
|
||||
|
||||
Reference in New Issue
Block a user