2009-04-07 14:53:29

by Johannes Weiner

[permalink] [raw]
Subject: [patch] s6gmac: don't use device->bus_id directly

Use the dev_name() helper to get a name string for a device instead of
open-coding random device field accesses.

With '1fa5ae8 driver core: get rid of struct device's bus_id string
array' in place, this is not just a cleanup but a compilation fix.

Signed-off-by: Johannes Weiner <[email protected]>
---
drivers/net/s6gmac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

Andrew, this is for s6gmac-xtensa-s6000-on-chip-ethernet-driver.patch

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index 74bf583..5345e47 100644
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -795,7 +795,7 @@ static inline int s6gmac_phy_start(struct net_device *dev)
struct phy_device *p = NULL;
while ((!(p = pd->mii.bus->phy_map[i])) && (i < PHY_MAX_ADDR))
i++;
- p = phy_connect(dev, p->dev.bus_id, &s6gmac_adjust_link, 0,
+ p = phy_connect(dev, dev_name(&p->dev), &s6gmac_adjust_link, 0,
PHY_INTERFACE_MODE_RGMII);
if (IS_ERR(p)) {
printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
--
1.6.2.107.ge47ee