073-v5.12-0005-net-broadcom-bcm4908_enet-drop-inline-from-C-functio.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475
  1. From 7b778ae4eb9cd6e1518e4e47902a104b13ae8929 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
  3. Date: Thu, 11 Feb 2021 13:12:36 +0100
  4. Subject: [PATCH] net: broadcom: bcm4908_enet: drop "inline" from C functions
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. It seems preferred to let compiler optimize code if applicable.
  9. While at it drop unused enet_umac_maskset().
  10. Suggested-by: Andrew Lunn <[email protected]>
  11. Signed-off-by: Rafał Miłecki <[email protected]>
  12. Reviewed-by: Andrew Lunn <[email protected]>
  13. Reviewed-by: Florian Fainelli <[email protected]>
  14. Signed-off-by: David S. Miller <[email protected]>
  15. ---
  16. drivers/net/ethernet/broadcom/bcm4908_enet.c | 19 +++++++------------
  17. 1 file changed, 7 insertions(+), 12 deletions(-)
  18. --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
  19. +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
  20. @@ -75,17 +75,17 @@ struct bcm4908_enet {
  21. * R/W ops
  22. */
  23. -static inline u32 enet_read(struct bcm4908_enet *enet, u16 offset)
  24. +static u32 enet_read(struct bcm4908_enet *enet, u16 offset)
  25. {
  26. return readl(enet->base + offset);
  27. }
  28. -static inline void enet_write(struct bcm4908_enet *enet, u16 offset, u32 value)
  29. +static void enet_write(struct bcm4908_enet *enet, u16 offset, u32 value)
  30. {
  31. writel(value, enet->base + offset);
  32. }
  33. -static inline void enet_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, u32 set)
  34. +static void enet_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, u32 set)
  35. {
  36. u32 val;
  37. @@ -96,27 +96,22 @@ static inline void enet_maskset(struct b
  38. enet_write(enet, offset, val);
  39. }
  40. -static inline void enet_set(struct bcm4908_enet *enet, u16 offset, u32 set)
  41. +static void enet_set(struct bcm4908_enet *enet, u16 offset, u32 set)
  42. {
  43. enet_maskset(enet, offset, set, set);
  44. }
  45. -static inline u32 enet_umac_read(struct bcm4908_enet *enet, u16 offset)
  46. +static u32 enet_umac_read(struct bcm4908_enet *enet, u16 offset)
  47. {
  48. return enet_read(enet, ENET_UNIMAC + offset);
  49. }
  50. -static inline void enet_umac_write(struct bcm4908_enet *enet, u16 offset, u32 value)
  51. +static void enet_umac_write(struct bcm4908_enet *enet, u16 offset, u32 value)
  52. {
  53. enet_write(enet, ENET_UNIMAC + offset, value);
  54. }
  55. -static inline void enet_umac_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, u32 set)
  56. -{
  57. - enet_maskset(enet, ENET_UNIMAC + offset, mask, set);
  58. -}
  59. -
  60. -static inline void enet_umac_set(struct bcm4908_enet *enet, u16 offset, u32 set)
  61. +static void enet_umac_set(struct bcm4908_enet *enet, u16 offset, u32 set)
  62. {
  63. enet_set(enet, ENET_UNIMAC + offset, set);
  64. }