aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/renesas
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>2013-06-06 05:50:30 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-06 19:04:04 -0400
commitb7feacf1ee6944fc571802d58dcffaf13b4fb4cc (patch)
tree7cdf239e3eb6d1bd2feaef90fbfe3699e03160d4 /drivers/net/ethernet/renesas
parent5b3dfd13ae8bdebea67c02612fe282baff850bb0 (diff)
sh_eth: remove #ifdef around sh_eth_select_mii()
We can simply remove #ifdef'fery around sh_eth_select_mii(). We have to annotate it with '__maybe_unused' then. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> [Sergei: added the changelog, reworded the subject, changing the prefix.] Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas')
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index d0151d02416f..2234a945ae5b 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -313,10 +313,7 @@ static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
313 [TSU_ADRL31] = 0x01fc, 313 [TSU_ADRL31] = 0x01fc,
314}; 314};
315 315
316#if defined(CONFIG_CPU_SUBTYPE_SH7734) || \ 316static void __maybe_unused sh_eth_select_mii(struct net_device *ndev)
317 defined(CONFIG_CPU_SUBTYPE_SH7763) || \
318 defined(CONFIG_ARCH_R8A7740)
319static void sh_eth_select_mii(struct net_device *ndev)
320{ 317{
321 u32 value = 0x0; 318 u32 value = 0x0;
322 struct sh_eth_private *mdp = netdev_priv(ndev); 319 struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -339,7 +336,6 @@ static void sh_eth_select_mii(struct net_device *ndev)
339 336
340 sh_eth_write(ndev, value, RMII_MII); 337 sh_eth_write(ndev, value, RMII_MII);
341} 338}
342#endif
343 339
344static void __maybe_unused sh_eth_set_duplex(struct net_device *ndev) 340static void __maybe_unused sh_eth_set_duplex(struct net_device *ndev)
345{ 341{