]> err.no Git - linux-2.6/commitdiff
sky2: remove unneeded mask update
authorStephen Hemminger <shemminger@linux-foundation.org>
Mon, 5 Nov 2007 23:52:12 +0000 (15:52 -0800)
committerJeff Garzik <jeff@garzik.org>
Sat, 10 Nov 2007 09:25:09 +0000 (04:25 -0500)
The IRQ's is already masked on shutdown, and on startup avoid
touching PHY until after phy_init().

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/sky2.c

index 3c08db41cec46f076f28a78424ccd40f6658c74e..76038bbeb50eaa4da7233f41306da629b78feb1e 100644 (file)
@@ -288,8 +288,6 @@ static void sky2_gmac_reset(struct sky2_hw *hw, unsigned port)
 
        /* disable all GMAC IRQ's */
        sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0);
-       /* disable PHY IRQs */
-       gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
 
        gma_write16(hw, port, GM_MC_ADDR_H1, 0);        /* clear MC hash */
        gma_write16(hw, port, GM_MC_ADDR_H2, 0);