[PATCH net-next 5.12 5/8] net: broadcom: bcm4908_enet: drop "inline" from C functions
From: Rafał Miłecki <zajec5@gmail.com>
Date: 2021-02-11 12:17:16
Also in:
netdev
Subsystem:
broadcom bcm4908 ethernet driver, networking drivers, the rest · Maintainers:
Rafał Miłecki, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Rafał Miłecki <rafal@milecki.pl> It seems preferred to let compiler optimize code if applicable. While at it drop unused enet_umac_maskset(). Suggested-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- drivers/net/ethernet/broadcom/bcm4908_enet.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c
index f4e31646d50f..7d619aa9410a 100644
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c@@ -75,17 +75,17 @@ struct bcm4908_enet { * R/W ops */ -static inline u32 enet_read(struct bcm4908_enet *enet, u16 offset) +static u32 enet_read(struct bcm4908_enet *enet, u16 offset) { return readl(enet->base + offset); } -static inline void enet_write(struct bcm4908_enet *enet, u16 offset, u32 value) +static void enet_write(struct bcm4908_enet *enet, u16 offset, u32 value) { writel(value, enet->base + offset); } -static inline void enet_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, u32 set) +static void enet_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, u32 set) { u32 val;
@@ -96,27 +96,22 @@ static inline void enet_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, enet_write(enet, offset, val); } -static inline void enet_set(struct bcm4908_enet *enet, u16 offset, u32 set) +static void enet_set(struct bcm4908_enet *enet, u16 offset, u32 set) { enet_maskset(enet, offset, set, set); } -static inline u32 enet_umac_read(struct bcm4908_enet *enet, u16 offset) +static u32 enet_umac_read(struct bcm4908_enet *enet, u16 offset) { return enet_read(enet, ENET_UNIMAC + offset); } -static inline void enet_umac_write(struct bcm4908_enet *enet, u16 offset, u32 value) +static void enet_umac_write(struct bcm4908_enet *enet, u16 offset, u32 value) { enet_write(enet, ENET_UNIMAC + offset, value); } -static inline void enet_umac_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, u32 set) -{ - enet_maskset(enet, ENET_UNIMAC + offset, mask, set); -} - -static inline void enet_umac_set(struct bcm4908_enet *enet, u16 offset, u32 set) +static void enet_umac_set(struct bcm4908_enet *enet, u16 offset, u32 set) { enet_set(enet, ENET_UNIMAC + offset, set); }
--
2.26.2