aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2008-12-21 04:54:30 -0500
committerGrant Likely <grant.likely@secretlab.ca>2008-12-21 04:54:30 -0500
commite51f47a5c695b76905aadc2be47c7dc774f3e5af (patch)
tree1bdd9ea57f6bbeb5a223268ede94c55699aab218 /drivers/net
parent6b61e69e7bc1cfe80ab54c6321f19061f9487ed3 (diff)
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
As this driver polls for a complete MDIO transaction, there is no need to enable interrupts for it. Furthermore, make both checks for freeing MDIO-bus irqs consistent. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec_mpc52xx_phy.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 45dd9bdc5d62..dd9bfa42ac34 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -122,9 +122,6 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
122 out_be32(&priv->regs->mii_speed, 122 out_be32(&priv->regs->mii_speed,
123 ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1); 123 ((mpc52xx_find_ipb_freq(of->node) >> 20) / 5) << 1);
124 124
125 /* enable MII interrupt */
126 out_be32(&priv->regs->imask, in_be32(&priv->regs->imask) | FEC_IMASK_MII);
127
128 err = mdiobus_register(bus); 125 err = mdiobus_register(bus);
129 if (err) 126 if (err)
130 goto out_unmap; 127 goto out_unmap;
@@ -156,7 +153,7 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
156 153
157 iounmap(priv->regs); 154 iounmap(priv->regs);
158 for (i=0; i<PHY_MAX_ADDR; i++) 155 for (i=0; i<PHY_MAX_ADDR; i++)
159 if (bus->irq[i]) 156 if (bus->irq[i] != PHY_POLL)
160 irq_dispose_mapping(bus->irq[i]); 157 irq_dispose_mapping(bus->irq[i]);
161 kfree(priv); 158 kfree(priv);
162 kfree(bus->irq); 159 kfree(bus->irq);