aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-11-05 18:52:12 -0500
committerJeff Garzik <jeff@garzik.org>2007-11-10 04:25:09 -0500
commitab1a145638addee40587daf12c98ec6a30029f0a (patch)
treec3051f7ee5722fef472051f6f70c2ca92b3f099d /drivers
parent44388c7ead4b2bae9f82bc0862475640c50f357d (diff)
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 <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3c08db41cec4..76038bbeb50e 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)
288 288
289 /* disable all GMAC IRQ's */ 289 /* disable all GMAC IRQ's */
290 sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0); 290 sky2_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0);
291 /* disable PHY IRQs */
292 gm_phy_write(hw, port, PHY_MARV_INT_MASK, 0);
293 291
294 gma_write16(hw, port, GM_MC_ADDR_H1, 0); /* clear MC hash */ 292 gma_write16(hw, port, GM_MC_ADDR_H1, 0); /* clear MC hash */
295 gma_write16(hw, port, GM_MC_ADDR_H2, 0); 293 gma_write16(hw, port, GM_MC_ADDR_H2, 0);