diff options
| author | Kumar Gala <galak@gate.crashing.org> | 2006-01-11 11:27:33 -0800 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-12 16:31:52 -0500 |
| commit | 4d3248a29cb78b31bb0520eb99b4be620e810a40 (patch) | |
| tree | b33b6a028b926c9a260be42534ddf9b998dbb9b2 /drivers | |
| parent | a4d00f179fcec7065fe5742e9cebd6500886070f (diff) | |
| download | op-kernel-dev-4d3248a29cb78b31bb0520eb99b4be620e810a40.zip op-kernel-dev-4d3248a29cb78b31bb0520eb99b4be620e810a40.tar.gz | |
[PATCH] gianfar: Use new PHY_ID_FMT macro
Make the driver produce the string used by phy_connect and have board specific
code pass the integer mii bus id and phy device id for the specific controller
instance.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/gianfar.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 637b73a..0c18dbd 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -399,12 +399,15 @@ static int init_phy(struct net_device *dev) priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT ? SUPPORTED_1000baseT_Full : 0; struct phy_device *phydev; + char phy_id[BUS_ID_SIZE]; priv->oldlink = 0; priv->oldspeed = 0; priv->oldduplex = -1; - phydev = phy_connect(dev, priv->einfo->bus_id, &adjust_link, 0); + snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, priv->einfo->bus_id, priv->einfo->phy_id); + + phydev = phy_connect(dev, phy_id, &adjust_link, 0); if (IS_ERR(phydev)) { printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); |
