| From b26562eed71621d335808185a2b467a62ef01827 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Thu, 20 Jun 2013 02:22:56 +0400 |
| Subject: sh_eth: remove 'tx_error_check' field of 'struct sh_eth_cpu_data' |
| |
| The 'tx_error_check' field of 'struct sh_eth_cpu_data' is write-only, so remove |
| it along with the DEFAULT_TX_ERROR_CHECK macro. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 8f80899665c4baca5fe18e919a18db818c3e11fa) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| drivers/net/ethernet/renesas/sh_eth.c |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 14 -------------- |
| drivers/net/ethernet/renesas/sh_eth.h | 3 --- |
| 2 files changed, 17 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 0389ac0e..d8899f63 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -385,7 +385,6 @@ static struct sh_eth_cpu_data r8a777x_data = { |
| .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | |
| EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | |
| EESR_ECI, |
| - .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, |
| |
| .apr = 1, |
| .mpr = 1, |
| @@ -422,7 +421,6 @@ static struct sh_eth_cpu_data sh7724_data = { |
| .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | |
| EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | |
| EESR_ECI, |
| - .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, |
| |
| .apr = 1, |
| .mpr = 1, |
| @@ -460,7 +458,6 @@ static struct sh_eth_cpu_data sh7757_data = { |
| .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | |
| EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | |
| EESR_ECI, |
| - .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, |
| |
| .irq_flags = IRQF_SHARED, |
| .apr = 1, |
| @@ -530,8 +527,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = { |
| .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | |
| EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | |
| EESR_TDE | EESR_ECI, |
| - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ |
| - EESR_TFE, |
| .fdr_value = 0x0000072f, |
| .rmcr_value = 0x00000001, |
| |
| @@ -590,8 +585,6 @@ static struct sh_eth_cpu_data sh7734_data = { |
| .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \ |
| EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \ |
| EESR_ECI, |
| - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ |
| - EESR_TFE, |
| |
| .apr = 1, |
| .mpr = 1, |
| @@ -619,8 +612,6 @@ static struct sh_eth_cpu_data sh7763_data = { |
| .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | |
| EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | |
| EESR_TDE | EESR_ECI, |
| - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ |
| - EESR_TFE, |
| |
| .apr = 1, |
| .mpr = 1, |
| @@ -658,8 +649,6 @@ static struct sh_eth_cpu_data r8a7740_data = { |
| .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | |
| EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | |
| EESR_TDE | EESR_ECI, |
| - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ |
| - EESR_TFE, |
| |
| .apr = 1, |
| .mpr = 1, |
| @@ -709,9 +698,6 @@ static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd) |
| |
| if (!cd->eesr_err_check) |
| cd->eesr_err_check = DEFAULT_EESR_ERR_CHECK; |
| - |
| - if (!cd->tx_error_check) |
| - cd->tx_error_check = DEFAULT_TX_ERROR_CHECK; |
| } |
| |
| static int sh_eth_check_reset(struct net_device *ndev) |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h |
| index 99beb393..5a06aaf1 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.h |
| +++ b/drivers/net/ethernet/renesas/sh_eth.h |
| @@ -261,8 +261,6 @@ enum EESR_BIT { |
| #define DEFAULT_EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | \ |
| EESR_RDE | EESR_RFRMER | EESR_ADE | \ |
| EESR_TFE | EESR_TDE | EESR_ECI) |
| -#define DEFAULT_TX_ERROR_CHECK (EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | \ |
| - EESR_TFE) |
| |
| /* EESIPR */ |
| enum DMAC_IM_BIT { |
| @@ -468,7 +466,6 @@ struct sh_eth_cpu_data { |
| /* interrupt checking mask */ |
| unsigned long tx_check; |
| unsigned long eesr_err_check; |
| - unsigned long tx_error_check; |
| |
| /* hardware features */ |
| unsigned long irq_flags; /* IRQ configuration flags */ |
| -- |
| 1.8.4.3.gca3854a |
| |