Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2274d375 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: uninline sh_eth_{write|read}() 



Commit 3365711d ("sh_eth: WARN on access to a register not implemented in
in  a particular chip") added WARN_ON() to sh_eth_{read|write}(), thus making
it  unacceptable for these functions to be *inline* anymore. Remove *inline*
and move the functions from the header to the driver itself. Below   is our
code economy with ARM gcc 4.7.3:

$ size drivers/net/ethernet/renesas/sh_eth.o{~,}
   text	   data	    bss	    dec	    hex	filename
  32489	   1140	      0	  33629	   835d	drivers/net/ethernet/renesas/sh_eth.o~
  25413	   1140	      0	  26553	   67b9	drivers/net/ethernet/renesas/sh_eth.o

Suggested-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d856c16d

drivers/net/ethernet/renesas/sh_eth.c

+24 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
		NETIF_MSG_RX_ERR| \

		NETIF_MSG_TX_ERR)



#define SH_ETH_OFFSET_INVALID	((u16)~0)



#define SH_ETH_OFFSET_DEFAULTS			\

	[0 ... SH_ETH_MAX_REGISTER_OFFSET - 1] = SH_ETH_OFFSET_INVALID
@@ -404,6 +406,28 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = { 
static void sh_eth_rcv_snd_disable(struct net_device *ndev);

static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev);



static void sh_eth_write(struct net_device *ndev, u32 data, int enum_index)

{

	struct sh_eth_private *mdp = netdev_priv(ndev);

	u16 offset = mdp->reg_offset[enum_index];



	if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))

		return;



	iowrite32(data, mdp->addr + offset);

}



static u32 sh_eth_read(struct net_device *ndev, int enum_index)

{

	struct sh_eth_private *mdp = netdev_priv(ndev);

	u16 offset = mdp->reg_offset[enum_index];



	if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))

		return ~0U;



	return ioread32(mdp->addr + offset);

}



static bool sh_eth_is_gether(struct sh_eth_private *mdp)

{

	return mdp->reg_offset == sh_eth_offset_gigabit;

drivers/net/ethernet/renesas/sh_eth.h

+0 −25
Original line number Diff line number Diff line
@@ -546,31 +546,6 @@ static inline void sh_eth_soft_swap(char *src, int len) 
#endif

}



#define SH_ETH_OFFSET_INVALID	((u16) ~0)



static inline void sh_eth_write(struct net_device *ndev, u32 data,

				int enum_index)

{

	struct sh_eth_private *mdp = netdev_priv(ndev);

	u16 offset = mdp->reg_offset[enum_index];



	if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))

		return;



	iowrite32(data, mdp->addr + offset);

}



static inline u32 sh_eth_read(struct net_device *ndev, int enum_index)

{

	struct sh_eth_private *mdp = netdev_priv(ndev);

	u16 offset = mdp->reg_offset[enum_index];



	if (WARN_ON(offset == SH_ETH_OFFSET_INVALID))

		return ~0U;



	return ioread32(mdp->addr + offset);

}



static inline void *sh_eth_tsu_get_offset(struct sh_eth_private *mdp,

					  int enum_index)

{