| From af86024a481a94c4a02452ab29dfe47e0a31835d Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Tue, 27 Feb 2018 14:58:16 +0300 |
| Subject: [PATCH 0481/1795] sh_eth: uninline TSU register accessors |
| |
| We have uninlined the sh_eth_{read|write}() functions introduced in the |
| commit 4a55530f38e ("net: sh_eth: modify the definitions of register"). |
| Now remove *inline* from sh_eth_tsu_{read|write}() as well and move |
| these functions from the header to the driver itself. This saves 684 |
| more bytes of object code (ARM gcc 4.8.5)... |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 55ea874306ea28e6be9e07b7e89bbb9fb674e8eb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 11 +++++++++++ |
| drivers/net/ethernet/renesas/sh_eth.h | 11 ----------- |
| 2 files changed, 11 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index cffd58af7c45..4e2f46fa8353 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -439,6 +439,17 @@ static void sh_eth_modify(struct net_device *ndev, int enum_index, u32 clear, |
| enum_index); |
| } |
| |
| +static void sh_eth_tsu_write(struct sh_eth_private *mdp, u32 data, |
| + int enum_index) |
| +{ |
| + iowrite32(data, mdp->tsu_addr + mdp->reg_offset[enum_index]); |
| +} |
| + |
| +static u32 sh_eth_tsu_read(struct sh_eth_private *mdp, int enum_index) |
| +{ |
| + return ioread32(mdp->tsu_addr + mdp->reg_offset[enum_index]); |
| +} |
| + |
| static bool sh_eth_is_gether(struct sh_eth_private *mdp) |
| { |
| return mdp->reg_offset == sh_eth_offset_gigabit; |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h |
| index 6ab3d46d4f28..fdd6d71c03d1 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.h |
| +++ b/drivers/net/ethernet/renesas/sh_eth.h |
| @@ -568,15 +568,4 @@ static inline void *sh_eth_tsu_get_offset(struct sh_eth_private *mdp, |
| return mdp->tsu_addr + mdp->reg_offset[enum_index]; |
| } |
| |
| -static inline void sh_eth_tsu_write(struct sh_eth_private *mdp, u32 data, |
| - int enum_index) |
| -{ |
| - iowrite32(data, mdp->tsu_addr + mdp->reg_offset[enum_index]); |
| -} |
| - |
| -static inline u32 sh_eth_tsu_read(struct sh_eth_private *mdp, int enum_index) |
| -{ |
| - return ioread32(mdp->tsu_addr + mdp->reg_offset[enum_index]); |
| -} |
| - |
| #endif /* #ifndef __SH_ETH_H__ */ |
| -- |
| 2.19.0 |
| |