summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/driver.c
diff options
context:
space:
mode:
authorKay Sievers2008-05-02 06:02:41 +0200
committerGreg Kroah-Hartman2008-07-22 00:15:46 +0200
commit7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005 (patch)
tree6e269adae8630b505a69efd0b8351440ef6b69b8 /drivers/usb/core/driver.c
parentUSB: revert "don't lose disconnections during suspend" (diff)
downloadkernel-qcow2-linux-7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005.tar.gz
kernel-qcow2-linux-7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005.tar.xz
kernel-qcow2-linux-7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005.zip
USB: usb dev_name() instead of dev->bus_id
The bus_id field is going away, use the dev_name() function instead. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/driver.c')
-rw-r--r--drivers/usb/core/driver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 1e56f1cfa6dc..d0b37d776afe 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -586,7 +586,7 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
struct usb_device *usb_dev;
/* driver is often null here; dev_dbg() would oops */
- pr_debug("usb %s: uevent\n", dev->bus_id);
+ pr_debug("usb %s: uevent\n", dev_name(dev));
if (is_usb_device(dev))
usb_dev = to_usb_device(dev);
@@ -596,11 +596,11 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env)
}
if (usb_dev->devnum < 0) {
- pr_debug("usb %s: already deleted?\n", dev->bus_id);
+ pr_debug("usb %s: already deleted?\n", dev_name(dev));
return -ENODEV;
}
if (!usb_dev->bus) {
- pr_debug("usb %s: bus removed?\n", dev->bus_id);
+ pr_debug("usb %s: bus removed?\n", dev_name(dev));
return -ENODEV;
}