From: Stephen Hemminger Date: Mon, 5 Nov 2007 23:52:12 +0000 (-0800) Subject: sky2: remove unneeded mask update X-Git-Tag: v2.6.24-rc3~163^2~35 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ab1a145638addee40587daf12c98ec6a30029f0a;p=linux-2.6-omap-h63xx.git sky2: remove unneeded mask update The IRQ's is already masked on shutdown, and on startup avoid touching PHY until after phy_init(). Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 3c08db41cec..76038bbeb50 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -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);