Merge tag 'nfs-for-3.6-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[cascardo/linux.git] / drivers / staging / sbe-2t3e3 / dc.c

diff --git a/drivers/staging/sbe-2t3e3/dc.c b/drivers/staging/sbe-2t3e3/dc.c
index 9dc4ec2..9e81d90 100644 (file)
--- a/drivers/staging/sbe-2t3e3/dc.c
+++ b/drivers/staging/sbe-2t3e3/dc.c
@@ -63,14 +63,6 @@ void dc_init(struct channel *sc)
        if (sc->p.loopback == SBE_2T3E3_LOOPBACK_ETHERNET)
                sc->p.loopback = SBE_2T3E3_LOOPBACK_NONE;
 
-#if 0 /* No need to clear this register - and it may be in use */
-       /*
-        * BOOT_ROM_SERIAL_ROM_AND_MII_MANAGEMENT (CSR9)
-        */
-       val = 0;
-       dc_write(sc->addr, SBE_2T3E3_21143_REG_BOOT_ROM_SERIAL_ROM_AND_MII_MANAGEMENT, val);
-#endif
-
        /*
         * GENERAL_PURPOSE_TIMER_AND_INTERRUPT_MITIGATION_CONTROL (CSR11)
         */
@@ -81,7 +73,7 @@ void dc_init(struct channel *sc)
                SBE_2T3E3_21143_VAL_NUMBER_OF_RECEIVE_PACKETS;
        dc_write(sc->addr, SBE_2T3E3_21143_REG_GENERAL_PURPOSE_TIMER_AND_INTERRUPT_MITIGATION_CONTROL, val);
 
-       /* prepare descriptors and data for receive and transmit procecsses */
+       /* prepare descriptors and data for receive and transmit processes */
        if (dc_init_descriptor_list(sc) != 0)
                return;
 
@@ -301,15 +293,6 @@ void dc_set_loopback(struct channel *sc, u32 mode)
                return;
        }
 
-#if 0
-       /* restart SIA */
-       dc_clear_bits(sc->addr, SBE_2T3E3_21143_REG_SIA_CONNECTIVITY,
-                     SBE_2T3E3_21143_VAL_SIA_RESET);
-       udelay(1000);
-       dc_set_bits(sc->addr, SBE_2T3E3_21143_REG_SIA_CONNECTIVITY,
-                   SBE_2T3E3_21143_VAL_SIA_RESET);
-#endif
-
        /* select loopback mode */
        val = dc_read(sc->addr, SBE_2T3E3_21143_REG_OPERATION_MODE) &
                ~SBE_2T3E3_21143_VAL_OPERATING_MODE;