The patch titled
s6gmac: don't use device->bus_id directly
has been removed from the -mm tree. Its filename was
s6gmac-xtensa-s6000-on-chip-ethernet-driver-fix.patch
This patch was dropped because it was folded into s6gmac-xtensa-s6000-on-chip-ethernet-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: s6gmac: don't use device->bus_id directly
From: Johannes Weiner <jw@xxxxxxxxx>
Use the dev_name() helper to get a name string for a device instead of
open-coding random device field accesses.
With commit 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 <jw@xxxxxxxxx>
Cc: Oskar Schirmer <os@xxxxxxxxx>
Cc: Daniel Glockner <dg@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Christian Zankel <chris@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/s6gmac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/s6gmac.c~s6gmac-xtensa-s6000-on-chip-ethernet-driver-fix drivers/net/s6gmac.c
--- a/drivers/net/s6gmac.c~s6gmac-xtensa-s6000-on-chip-ethernet-driver-fix
+++ a/drivers/net/s6gmac.c
@@ -795,7 +795,7 @@ static inline int s6gmac_phy_start(struc
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);
_
Patches currently in -mm which might be from jw@xxxxxxxxx are
xtensa-variant-specific-code.patch
xtensa-cache-inquiry-and-unaligned-cache-handling-functions.patch
xtensa-allow-platform-and-variant-to-initialize-own-irq-chips.patch
xtensa-support-s6000-gpio-irqs-and-alternate-function-selection.patch
s6gmac-xtensa-s6000-on-chip-ethernet-driver.patch
s6gmac-xtensa-s6000-on-chip-ethernet-driver-fix.patch
xtensa-s6105-specific-configuration-for-s6gmac.patch
xtensa-enable-s6gmac-in-s6105_defconfig.patch
flat-fix-data-sections-alignment.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
