Skip to content

Commit 62b0a03

Browse files
Russell King (Oracle)kuba-moo
Russell King (Oracle)
authored and
kuba-moo
committed
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>
1 parent 305a0f6 commit 62b0a03

File tree

4 files changed

+0
-67
lines changed

4 files changed

+0
-67
lines changed

‎drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -362,17 +362,6 @@ static int dwmac1000_set_lpi_mode(struct mac_device_info *hw,
362362
return 0;
363363
}
364364

365-
static void dwmac1000_set_eee_mode(struct mac_device_info *hw,
366-
bool en_tx_lpi_clockgating)
367-
{
368-
dwmac1000_set_lpi_mode(hw, STMMAC_LPI_FORCED, en_tx_lpi_clockgating, 0);
369-
}
370-
371-
static void dwmac1000_reset_eee_mode(struct mac_device_info *hw)
372-
{
373-
dwmac1000_set_lpi_mode(hw, STMMAC_LPI_DISABLE, false, 0);
374-
}
375-
376365
static void dwmac1000_set_eee_pls(struct mac_device_info *hw, int link)
377366
{
378367
void __iomem *ioaddr = hw->pcsr;
@@ -514,8 +503,6 @@ const struct stmmac_ops dwmac1000_ops = {
514503
.set_umac_addr = dwmac1000_set_umac_addr,
515504
.get_umac_addr = dwmac1000_get_umac_addr,
516505
.set_lpi_mode = dwmac1000_set_lpi_mode,
517-
.set_eee_mode = dwmac1000_set_eee_mode,
518-
.reset_eee_mode = dwmac1000_reset_eee_mode,
519506
.set_eee_timer = dwmac1000_set_eee_timer,
520507
.set_eee_pls = dwmac1000_set_eee_pls,
521508
.debug = dwmac1000_debug,

‎drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -418,21 +418,6 @@ static int dwmac4_set_lpi_mode(struct mac_device_info *hw,
418418
return 0;
419419
}
420420

421-
static void dwmac4_set_eee_mode(struct mac_device_info *hw,
422-
bool en_tx_lpi_clockgating)
423-
{
424-
/* Enable the link status receive on RGMII, SGMII ore SMII
425-
* receive path and instruct the transmit to enter in LPI
426-
* state.
427-
*/
428-
dwmac4_set_lpi_mode(hw, STMMAC_LPI_FORCED, en_tx_lpi_clockgating, 0);
429-
}
430-
431-
static void dwmac4_reset_eee_mode(struct mac_device_info *hw)
432-
{
433-
dwmac4_set_lpi_mode(hw, STMMAC_LPI_DISABLE, false, 0);
434-
}
435-
436421
static void dwmac4_set_eee_pls(struct mac_device_info *hw, int link)
437422
{
438423
void __iomem *ioaddr = hw->pcsr;
@@ -448,11 +433,6 @@ static void dwmac4_set_eee_pls(struct mac_device_info *hw, int link)
448433
writel(value, ioaddr + GMAC4_LPI_CTRL_STATUS);
449434
}
450435

451-
static void dwmac4_set_eee_lpi_entry_timer(struct mac_device_info *hw, u32 et)
452-
{
453-
dwmac4_set_lpi_mode(hw, STMMAC_LPI_TIMER, false, et & STMMAC_ET_MAX);
454-
}
455-
456436
static void dwmac4_set_eee_timer(struct mac_device_info *hw, int ls, int tw)
457437
{
458438
void __iomem *ioaddr = hw->pcsr;
@@ -1214,9 +1194,6 @@ const struct stmmac_ops dwmac4_ops = {
12141194
.set_umac_addr = dwmac4_set_umac_addr,
12151195
.get_umac_addr = dwmac4_get_umac_addr,
12161196
.set_lpi_mode = dwmac4_set_lpi_mode,
1217-
.set_eee_mode = dwmac4_set_eee_mode,
1218-
.reset_eee_mode = dwmac4_reset_eee_mode,
1219-
.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,
12201197
.set_eee_timer = dwmac4_set_eee_timer,
12211198
.set_eee_pls = dwmac4_set_eee_pls,
12221199
.pcs_ctrl_ane = dwmac4_ctrl_ane,
@@ -1259,9 +1236,6 @@ const struct stmmac_ops dwmac410_ops = {
12591236
.set_umac_addr = dwmac4_set_umac_addr,
12601237
.get_umac_addr = dwmac4_get_umac_addr,
12611238
.set_lpi_mode = dwmac4_set_lpi_mode,
1262-
.set_eee_mode = dwmac4_set_eee_mode,
1263-
.reset_eee_mode = dwmac4_reset_eee_mode,
1264-
.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,
12651239
.set_eee_timer = dwmac4_set_eee_timer,
12661240
.set_eee_pls = dwmac4_set_eee_pls,
12671241
.pcs_ctrl_ane = dwmac4_ctrl_ane,
@@ -1306,9 +1280,6 @@ const struct stmmac_ops dwmac510_ops = {
13061280
.set_umac_addr = dwmac4_set_umac_addr,
13071281
.get_umac_addr = dwmac4_get_umac_addr,
13081282
.set_lpi_mode = dwmac4_set_lpi_mode,
1309-
.set_eee_mode = dwmac4_set_eee_mode,
1310-
.reset_eee_mode = dwmac4_reset_eee_mode,
1311-
.set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer,
13121283
.set_eee_timer = dwmac4_set_eee_timer,
13131284
.set_eee_pls = dwmac4_set_eee_pls,
13141285
.pcs_ctrl_ane = dwmac4_ctrl_ane,

‎drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -449,17 +449,6 @@ static int dwxgmac2_set_lpi_mode(struct mac_device_info *hw,
449449
return 0;
450450
}
451451

452-
static void dwxgmac2_set_eee_mode(struct mac_device_info *hw,
453-
bool en_tx_lpi_clockgating)
454-
{
455-
dwxgmac2_set_lpi_mode(hw, STMMAC_LPI_FORCED, en_tx_lpi_clockgating, 0);
456-
}
457-
458-
static void dwxgmac2_reset_eee_mode(struct mac_device_info *hw)
459-
{
460-
dwxgmac2_set_lpi_mode(hw, STMMAC_LPI_DISABLE, false, 0);
461-
}
462-
463452
static void dwxgmac2_set_eee_pls(struct mac_device_info *hw, int link)
464453
{
465454
void __iomem *ioaddr = hw->pcsr;
@@ -1536,8 +1525,6 @@ const struct stmmac_ops dwxgmac210_ops = {
15361525
.set_umac_addr = dwxgmac2_set_umac_addr,
15371526
.get_umac_addr = dwxgmac2_get_umac_addr,
15381527
.set_lpi_mode = dwxgmac2_set_lpi_mode,
1539-
.set_eee_mode = dwxgmac2_set_eee_mode,
1540-
.reset_eee_mode = dwxgmac2_reset_eee_mode,
15411528
.set_eee_timer = dwxgmac2_set_eee_timer,
15421529
.set_eee_pls = dwxgmac2_set_eee_pls,
15431530
.debug = NULL,
@@ -1594,8 +1581,6 @@ const struct stmmac_ops dwxlgmac2_ops = {
15941581
.set_umac_addr = dwxgmac2_set_umac_addr,
15951582
.get_umac_addr = dwxgmac2_get_umac_addr,
15961583
.set_lpi_mode = dwxgmac2_set_lpi_mode,
1597-
.set_eee_mode = dwxgmac2_set_eee_mode,
1598-
.reset_eee_mode = dwxgmac2_reset_eee_mode,
15991584
.set_eee_timer = dwxgmac2_set_eee_timer,
16001585
.set_eee_pls = dwxgmac2_set_eee_pls,
16011586
.debug = NULL,

‎drivers/net/ethernet/stmicro/stmmac/hwif.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,6 @@ struct stmmac_ops {
369369
int (*set_lpi_mode)(struct mac_device_info *hw,
370370
enum stmmac_lpi_mode mode,
371371
bool en_tx_lpi_clockgating, u32 et);
372-
void (*set_eee_mode)(struct mac_device_info *hw,
373-
bool en_tx_lpi_clockgating);
374-
void (*reset_eee_mode)(struct mac_device_info *hw);
375-
void (*set_eee_lpi_entry_timer)(struct mac_device_info *hw, u32 et);
376372
void (*set_eee_timer)(struct mac_device_info *hw, int ls, int tw);
377373
void (*set_eee_pls)(struct mac_device_info *hw, int link);
378374
void (*debug)(struct stmmac_priv *priv, void __iomem *ioaddr,
@@ -478,12 +474,6 @@ struct stmmac_ops {
478474
stmmac_do_void_callback(__priv, mac, get_umac_addr, __args)
479475
#define stmmac_set_lpi_mode(__priv, __args...) \
480476
stmmac_do_callback(__priv, mac, set_lpi_mode, __args)
481-
#define stmmac_set_eee_mode(__priv, __args...) \
482-
stmmac_do_void_callback(__priv, mac, set_eee_mode, __args)
483-
#define stmmac_reset_eee_mode(__priv, __args...) \
484-
stmmac_do_void_callback(__priv, mac, reset_eee_mode, __args)
485-
#define stmmac_set_eee_lpi_timer(__priv, __args...) \
486-
stmmac_do_void_callback(__priv, mac, set_eee_lpi_entry_timer, __args)
487477
#define stmmac_set_eee_timer(__priv, __args...) \
488478
stmmac_do_void_callback(__priv, mac, set_eee_timer, __args)
489479
#define stmmac_set_eee_pls(__priv, __args...) \

0 commit comments

Comments
 (0)