| From 3d2dbcaa3c5537719dee8411c7e6df892f1f7c97 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Wed, 19 Jun 2013 23:29:23 +0400 |
| Subject: sh_eth: define/use EESR_RX_CHECK macro |
| |
| sh_eth_interrupt() uses the same Rx interrupt mask twice to check the interrupt |
| status register -- #define EESR_RX_CHECK and use it instead. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit ea7d69e75ac06daa7bc2fca2a8317197e5e3c81c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 13 ++----------- |
| drivers/net/ethernet/renesas/sh_eth.h | 8 ++++++++ |
| 2 files changed, 10 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 56de4a6b..cc9886cb 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -1508,23 +1508,14 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev) |
| */ |
| intr_status &= sh_eth_read(ndev, EESIPR) | DMAC_M_ECI; |
| /* Clear interrupt */ |
| - if (intr_status & (EESR_FRC | EESR_RMAF | EESR_RRF | |
| - EESR_RTLF | EESR_RTSF | EESR_PRE | EESR_CERF | |
| - cd->tx_check | cd->eesr_err_check)) { |
| + if (intr_status & (EESR_RX_CHECK | cd->tx_check | cd->eesr_err_check)) { |
| sh_eth_write(ndev, intr_status, EESR); |
| ret = IRQ_HANDLED; |
| } else |
| goto other_irq; |
| |
| - if (intr_status & (EESR_FRC | /* Frame recv*/ |
| - EESR_RMAF | /* Multi cast address recv*/ |
| - EESR_RRF | /* Bit frame recv */ |
| - EESR_RTLF | /* Long frame recv*/ |
| - EESR_RTSF | /* short frame recv */ |
| - EESR_PRE | /* PHY-LSI recv error */ |
| - EESR_CERF)){ /* recv frame CRC error */ |
| + if (intr_status & EESR_RX_CHECK) |
| sh_eth_rx(ndev, intr_status); |
| - } |
| |
| /* Tx Check */ |
| if (intr_status & cd->tx_check) { |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h |
| index 040d010b..117b3241 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.h |
| +++ b/drivers/net/ethernet/renesas/sh_eth.h |
| @@ -248,6 +248,14 @@ enum EESR_BIT { |
| EESR_CERF = 0x00000001, |
| }; |
| |
| +#define EESR_RX_CHECK (EESR_FRC | /* Frame recv */ \ |
| + EESR_RMAF | /* Multicast address recv */ \ |
| + EESR_RRF | /* Bit frame recv */ \ |
| + EESR_RTLF | /* Long frame recv */ \ |
| + EESR_RTSF | /* Short frame recv */ \ |
| + EESR_PRE | /* PHY-LSI recv error */ \ |
| + EESR_CERF) /* Recv frame CRC error */ |
| + |
| #define DEFAULT_TX_CHECK (EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | \ |
| EESR_RTO) |
| #define DEFAULT_EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | \ |
| -- |
| 1.8.4.3.gca3854a |
| |