forked from Minki/linux
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>
This commit is contained in:
parent
3719109d61
commit
8f80899665
@ -384,7 +384,6 @@ static struct sh_eth_cpu_data r8a777x_data = {
|
||||
.tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO,
|
||||
.eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | 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,
|
||||
@ -420,7 +419,6 @@ static struct sh_eth_cpu_data sh7724_data = {
|
||||
.tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO,
|
||||
.eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | 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,
|
||||
@ -457,7 +455,6 @@ static struct sh_eth_cpu_data sh7757_data = {
|
||||
.tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO,
|
||||
.eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | 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,
|
||||
@ -527,8 +524,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = {
|
||||
.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,
|
||||
.fdr_value = 0x0000072f,
|
||||
.rmcr_value = 0x00000001,
|
||||
|
||||
@ -587,8 +582,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,
|
||||
@ -616,8 +609,6 @@ static struct sh_eth_cpu_data sh7763_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,
|
||||
@ -655,8 +646,6 @@ static struct sh_eth_cpu_data r8a7740_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,
|
||||
@ -706,9 +695,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)
|
||||
|
@ -261,8 +261,6 @@ enum EESR_BIT {
|
||||
#define DEFAULT_EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | \
|
||||
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 */
|
||||
|
Loading…
Reference in New Issue
Block a user