linux-next: wireless tree build failure

linux-next: wireless tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

Hi John,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/net/wireless/at76c50x-usb.c: In function 'at76_init_new_device':
drivers/net/wireless/at76c50x-usb.c:2271: error: 'struct device' has no member named 'bus_id'

Caused by commit 26b9886dbb1e6930a8a5df9dcf64d8dacb80597b ("at76c50x-usb:
add driver") from the wireless tree interacting with commit
d3592c7c13d14e410ffbf0e86dcd7abb3a23077f ("driver core: get rid of struct
device's bus_id string array") from the driver-core tree.

This can be fixed by using dev_name() which is already available in
Linus' tree.

I have dropped the wireless tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

[PATCH] at76c50x-usb: use dev_name() instead of struct device.bus_id

[Kalle Valo]

Stephen Rothwell reported that bus_id from struct device will be removed, use
dev_name() instead.

Signed-off-by: Kalle Valo <kalle.valo-X3B1VOXEql0@public.gmane.org>
---

 drivers/net/wireless/at76c50x-usb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index cc2a267..0c02f1c 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -2268,7 +2268,7 @@ static int at76_init_new_device(struct at76_priv *priv,
 
 	printk(KERN_INFO "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n",
 	       wiphy_name(priv->hw->wiphy),
-	       interface->dev.bus_id, mac2str(priv->mac_addr),
+	       dev_name(&interface->dev), mac2str(priv->mac_addr),
 	       priv->fw_version.major, priv->fw_version.minor,
 	       priv->fw_version.patch, priv->fw_version.build);
 	printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n",

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html