| From 0f4dfed19a45fb9f470eb56f6a840a8b7d9164fb Mon Sep 17 00:00:00 2001 |
| From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
| Date: Thu, 6 Jun 2013 09:50:30 +0000 |
| Subject: 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> |
| |
| (cherry picked from commit b7feacf1ee6944fc571802d58dcffaf13b4fb4cc) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 7ca34a52..2dd7be1f 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] = { |
| [TSU_ADRL31] = 0x01fc, |
| }; |
| |
| -#if defined(CONFIG_CPU_SUBTYPE_SH7734) || \ |
| - defined(CONFIG_CPU_SUBTYPE_SH7763) || \ |
| - defined(CONFIG_ARCH_R8A7740) |
| -static void sh_eth_select_mii(struct net_device *ndev) |
| +static void __maybe_unused sh_eth_select_mii(struct net_device *ndev) |
| { |
| u32 value = 0x0; |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| @@ -339,7 +336,6 @@ static void sh_eth_select_mii(struct net_device *ndev) |
| |
| sh_eth_write(ndev, value, RMII_MII); |
| } |
| -#endif |
| |
| static void __maybe_unused sh_eth_set_duplex(struct net_device *ndev) |
| { |
| -- |
| 1.8.4.3.gca3854a |
| |
