diff options
-rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index e778703880d3..f335bf119ab5 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c | |||
@@ -138,19 +138,6 @@ do { \ | |||
138 | #define CPSW_CMINTMAX_INTVL (1000 / CPSW_CMINTMIN_CNT) | 138 | #define CPSW_CMINTMAX_INTVL (1000 / CPSW_CMINTMIN_CNT) |
139 | #define CPSW_CMINTMIN_INTVL ((1000 / CPSW_CMINTMAX_CNT) + 1) | 139 | #define CPSW_CMINTMIN_INTVL ((1000 / CPSW_CMINTMAX_CNT) + 1) |
140 | 140 | ||
141 | #define cpsw_enable_irq(priv) \ | ||
142 | do { \ | ||
143 | u32 i; \ | ||
144 | for (i = 0; i < priv->num_irqs; i++) \ | ||
145 | enable_irq(priv->irqs_table[i]); \ | ||
146 | } while (0) | ||
147 | #define cpsw_disable_irq(priv) \ | ||
148 | do { \ | ||
149 | u32 i; \ | ||
150 | for (i = 0; i < priv->num_irqs; i++) \ | ||
151 | disable_irq_nosync(priv->irqs_table[i]); \ | ||
152 | } while (0) | ||
153 | |||
154 | #define cpsw_slave_index(priv) \ | 141 | #define cpsw_slave_index(priv) \ |
155 | ((priv->data.dual_emac) ? priv->emac_port : \ | 142 | ((priv->data.dual_emac) ? priv->emac_port : \ |
156 | priv->data.active_slave) | 143 | priv->data.active_slave) |
@@ -783,7 +770,7 @@ static irqreturn_t cpsw_rx_interrupt(int irq, void *dev_id) | |||
783 | 770 | ||
784 | cpsw_intr_disable(priv); | 771 | cpsw_intr_disable(priv); |
785 | if (priv->irq_enabled == true) { | 772 | if (priv->irq_enabled == true) { |
786 | cpsw_disable_irq(priv); | 773 | disable_irq_nosync(priv->irqs_table[0]); |
787 | priv->irq_enabled = false; | 774 | priv->irq_enabled = false; |
788 | } | 775 | } |
789 | 776 | ||
@@ -819,7 +806,7 @@ static int cpsw_poll(struct napi_struct *napi, int budget) | |||
819 | prim_cpsw = cpsw_get_slave_priv(priv, 0); | 806 | prim_cpsw = cpsw_get_slave_priv(priv, 0); |
820 | if (prim_cpsw->irq_enabled == false) { | 807 | if (prim_cpsw->irq_enabled == false) { |
821 | prim_cpsw->irq_enabled = true; | 808 | prim_cpsw->irq_enabled = true; |
822 | cpsw_enable_irq(priv); | 809 | enable_irq(priv->irqs_table[0]); |
823 | } | 810 | } |
824 | } | 811 | } |
825 | 812 | ||
@@ -1335,7 +1322,7 @@ static int cpsw_ndo_open(struct net_device *ndev) | |||
1335 | if (prim_cpsw->irq_enabled == false) { | 1322 | if (prim_cpsw->irq_enabled == false) { |
1336 | if ((priv == prim_cpsw) || !netif_running(prim_cpsw->ndev)) { | 1323 | if ((priv == prim_cpsw) || !netif_running(prim_cpsw->ndev)) { |
1337 | prim_cpsw->irq_enabled = true; | 1324 | prim_cpsw->irq_enabled = true; |
1338 | cpsw_enable_irq(prim_cpsw); | 1325 | enable_irq(prim_cpsw->irqs_table[0]); |
1339 | } | 1326 | } |
1340 | } | 1327 | } |
1341 | 1328 | ||