1 files changed, 1 insertions, 112 deletions

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 9b9b28e85a7d..b4c4cf467dc6 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1658,7 +1658,7 @@ static void en_dis_able_nic_intrs(struct s2io_nic *nic, u16 mask, int flag)
         /*  PIC Interrupts */
         if ((mask & (TX_PIC_INTR | RX_PIC_INTR))) {
                 /*  Enable PIC Intrs in the general intr mask register */
-                val64 = TXPIC_INT_M | PIC_RX_INT_M;
+                val64 = TXPIC_INT_M;
                 if (flag == ENABLE_INTRS) {
                         temp64 = readq(&bar0->general_int_mask);
                         temp64 &= ~((u64) val64);
@@ -1696,70 +1696,6 @@ static void en_dis_able_nic_intrs(struct s2io_nic *nic, u16 mask, int flag)
                 }
         }
 
-        /*  DMA Interrupts */
-        /*  Enabling/Disabling Tx DMA interrupts */
-        if (mask & TX_DMA_INTR) {
-                /* Enable TxDMA Intrs in the general intr mask register */
-                val64 = TXDMA_INT_M;
-                if (flag == ENABLE_INTRS) {
-                        temp64 = readq(&bar0->general_int_mask);
-                        temp64 &= ~((u64) val64);
-                        writeq(temp64, &bar0->general_int_mask);
-                        /*
-                         * Keep all interrupts other than PFC interrupt
-                         * and PCC interrupt disabled in DMA level.
-                         */
-                        val64 = DISABLE_ALL_INTRS & ~(TXDMA_PFC_INT_M |
-                                                      TXDMA_PCC_INT_M);
-                        writeq(val64, &bar0->txdma_int_mask);
-                        /*
-                         * Enable only the MISC error 1 interrupt in PFC block
-                         */
-                        val64 = DISABLE_ALL_INTRS & (~PFC_MISC_ERR_1);
-                        writeq(val64, &bar0->pfc_err_mask);
-                        /*
-                         * Enable only the FB_ECC error interrupt in PCC block
-                         */
-                        val64 = DISABLE_ALL_INTRS & (~PCC_FB_ECC_ERR);
-                        writeq(val64, &bar0->pcc_err_mask);
-                } else if (flag == DISABLE_INTRS) {
-                        /*
-                         * Disable TxDMA Intrs in the general intr mask
-                         * register
-                         */
-                        writeq(DISABLE_ALL_INTRS, &bar0->txdma_int_mask);
-                        writeq(DISABLE_ALL_INTRS, &bar0->pfc_err_mask);
-                        temp64 = readq(&bar0->general_int_mask);
-                        val64 |= temp64;
-                        writeq(val64, &bar0->general_int_mask);
-                }
-        }
-
-        /*  Enabling/Disabling Rx DMA interrupts */
-        if (mask & RX_DMA_INTR) {
-                /*  Enable RxDMA Intrs in the general intr mask register */
-                val64 = RXDMA_INT_M;
-                if (flag == ENABLE_INTRS) {
-                        temp64 = readq(&bar0->general_int_mask);
-                        temp64 &= ~((u64) val64);
-                        writeq(temp64, &bar0->general_int_mask);
-                        /*
-                         * All RxDMA block interrupts are disabled for now
-                         * TODO
-                         */
-                        writeq(DISABLE_ALL_INTRS, &bar0->rxdma_int_mask);
-                } else if (flag == DISABLE_INTRS) {
-                        /*
-                         * Disable RxDMA Intrs in the general intr mask
-                         * register
-                         */
-                        writeq(DISABLE_ALL_INTRS, &bar0->rxdma_int_mask);
-                        temp64 = readq(&bar0->general_int_mask);
-                        val64 |= temp64;
-                        writeq(val64, &bar0->general_int_mask);
-                }
-        }
-
         /*  MAC Interrupts */
         /*  Enabling/Disabling MAC interrupts */
         if (mask & (TX_MAC_INTR | RX_MAC_INTR)) {
@@ -1786,53 +1722,6 @@ static void en_dis_able_nic_intrs(struct s2io_nic *nic, u16 mask, int flag)
                 }
         }
 
-        /*  XGXS Interrupts */
-        if (mask & (TX_XGXS_INTR | RX_XGXS_INTR)) {
-                val64 = TXXGXS_INT_M | RXXGXS_INT_M;
-                if (flag == ENABLE_INTRS) {
-                        temp64 = readq(&bar0->general_int_mask);
-                        temp64 &= ~((u64) val64);
-                        writeq(temp64, &bar0->general_int_mask);
-                        /*
-                         * All XGXS block error interrupts are disabled for now
-                         * TODO
-                         */
-                        writeq(DISABLE_ALL_INTRS, &bar0->xgxs_int_mask);
-                } else if (flag == DISABLE_INTRS) {
-                        /*
-                         * Disable MC Intrs in the general intr mask register
-                         */
-                        writeq(DISABLE_ALL_INTRS, &bar0->xgxs_int_mask);
-                        temp64 = readq(&bar0->general_int_mask);
-                        val64 |= temp64;
-                        writeq(val64, &bar0->general_int_mask);
-                }
-        }
-
-        /*  Memory Controller(MC) interrupts */
-        if (mask & MC_INTR) {
-                val64 = MC_INT_M;
-                if (flag == ENABLE_INTRS) {
-                        temp64 = readq(&bar0->general_int_mask);
-                        temp64 &= ~((u64) val64);
-                        writeq(temp64, &bar0->general_int_mask);
-                        /*
-                         * Enable all MC Intrs.
-                         */
-                        writeq(0x0, &bar0->mc_int_mask);
-                        writeq(0x0, &bar0->mc_err_mask);
-                } else if (flag == DISABLE_INTRS) {
-                        /*
-                         * Disable MC Intrs in the general intr mask register
-                         */
-                        writeq(DISABLE_ALL_INTRS, &bar0->mc_int_mask);
-                        temp64 = readq(&bar0->general_int_mask);
-                        val64 |= temp64;
-                        writeq(val64, &bar0->general_int_mask);
-                }
-        }
-
-
         /*  Tx traffic interrupts */
         if (mask & TX_TRAFFIC_INTR) {
                 val64 = TXTRAFFIC_INT_M;