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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
36aa81172e
commit
7071a3ce0c
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user