| From e2ccda73a0d8f4ada60370ed9d08973976605cbf Mon Sep 17 00:00:00 2001 |
| From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
| Date: Thu, 6 Jun 2013 09:45:25 +0000 |
| Subject: sh_eth: remove duplicate sh_eth_set_duplex() definitions |
| |
| Remove all the duplicate definitions of sh_eth_set_duplex() under different |
| #ifdef's, leaving only one outside the #ifdef's. We have to annotate it with |
| '__maybe_unused' since it's called not from all SoC #ifdef blocks. |
| |
| Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> |
| [Sergei: annotated sh_eth_set_duplex() as '__maybe_unused', 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 04b0ed2ad49834fe47d3c4171ad189c688a222b9) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 59 +++-------------------------------- |
| 1 file changed, 5 insertions(+), 54 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index fd3f99f8..1dba3c9d 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -341,10 +341,7 @@ static void sh_eth_select_mii(struct net_device *ndev) |
| } |
| #endif |
| |
| -/* There is CPU dependent code */ |
| -#if defined(CONFIG_ARCH_R8A7778) || defined(CONFIG_ARCH_R8A7779) |
| -#define SH_ETH_RESET_DEFAULT 1 |
| -static void sh_eth_set_duplex(struct net_device *ndev) |
| +static void __maybe_unused sh_eth_set_duplex(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| |
| @@ -354,6 +351,9 @@ static void sh_eth_set_duplex(struct net_device *ndev) |
| sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR); |
| } |
| |
| +/* There is CPU dependent code */ |
| +#if defined(CONFIG_ARCH_R8A7778) || defined(CONFIG_ARCH_R8A7779) |
| +#define SH_ETH_RESET_DEFAULT 1 |
| static void sh_eth_set_rate(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| @@ -392,15 +392,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { |
| }; |
| #elif defined(CONFIG_CPU_SUBTYPE_SH7724) |
| #define SH_ETH_RESET_DEFAULT 1 |
| -static void sh_eth_set_duplex(struct net_device *ndev) |
| -{ |
| - struct sh_eth_private *mdp = netdev_priv(ndev); |
| - |
| - if (mdp->duplex) /* Full */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR); |
| - else /* Half */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR); |
| -} |
| |
| static void sh_eth_set_rate(struct net_device *ndev) |
| { |
| @@ -445,16 +436,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { |
| #define SH_ETH_HAS_TSU 1 |
| static int sh_eth_check_reset(struct net_device *ndev); |
| |
| -static void sh_eth_set_duplex(struct net_device *ndev) |
| -{ |
| - struct sh_eth_private *mdp = netdev_priv(ndev); |
| - |
| - if (mdp->duplex) /* Full */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR); |
| - else /* Half */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR); |
| -} |
| - |
| static void sh_eth_set_rate(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| @@ -555,16 +536,6 @@ out: |
| return ret; |
| } |
| |
| -static void sh_eth_set_duplex_giga(struct net_device *ndev) |
| -{ |
| - struct sh_eth_private *mdp = netdev_priv(ndev); |
| - |
| - if (mdp->duplex) /* Full */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR); |
| - else /* Half */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR); |
| -} |
| - |
| static void sh_eth_set_rate_giga(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| @@ -587,7 +558,7 @@ static void sh_eth_set_rate_giga(struct net_device *ndev) |
| /* SH7757(GETHERC) */ |
| static struct sh_eth_cpu_data sh_eth_my_cpu_data_giga = { |
| .chip_reset = sh_eth_chip_reset_giga, |
| - .set_duplex = sh_eth_set_duplex_giga, |
| + .set_duplex = sh_eth_set_duplex, |
| .set_rate = sh_eth_set_rate_giga, |
| |
| .ecsr_value = ECSR_ICD | ECSR_MPD, |
| @@ -637,16 +608,6 @@ static void sh_eth_chip_reset(struct net_device *ndev) |
| mdelay(1); |
| } |
| |
| -static void sh_eth_set_duplex(struct net_device *ndev) |
| -{ |
| - struct sh_eth_private *mdp = netdev_priv(ndev); |
| - |
| - if (mdp->duplex) /* Full */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR); |
| - else /* Half */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR); |
| -} |
| - |
| static void sh_eth_set_rate(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| @@ -774,16 +735,6 @@ out: |
| return ret; |
| } |
| |
| -static void sh_eth_set_duplex(struct net_device *ndev) |
| -{ |
| - struct sh_eth_private *mdp = netdev_priv(ndev); |
| - |
| - if (mdp->duplex) /* Full */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR); |
| - else /* Half */ |
| - sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR); |
| -} |
| - |
| static void sh_eth_set_rate(struct net_device *ndev) |
| { |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| -- |
| 1.8.4.3.gca3854a |
| |