diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-05-02 00:02:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 18:15:46 -0400 |
commit | 7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005 (patch) | |
tree | 6e269adae8630b505a69efd0b8351440ef6b69b8 | |
parent | 36aa81172edba8a3a8ecedbd1f56d41774ce2e08 (diff) |
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>
27 files changed, 51 insertions, 51 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) | |||
586 | struct usb_device *usb_dev; | 586 | struct usb_device *usb_dev; |
587 | 587 | ||
588 | /* driver is often null here; dev_dbg() would oops */ | 588 | /* driver is often null here; dev_dbg() would oops */ |
589 | pr_debug("usb %s: uevent\n", dev->bus_id); | 589 | pr_debug("usb %s: uevent\n", dev_name(dev)); |
590 | 590 | ||
591 | if (is_usb_device(dev)) | 591 | if (is_usb_device(dev)) |
592 | usb_dev = to_usb_device(dev); | 592 | usb_dev = to_usb_device(dev); |
@@ -596,11 +596,11 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
596 | } | 596 | } |
597 | 597 | ||
598 | if (usb_dev->devnum < 0) { | 598 | if (usb_dev->devnum < 0) { |
599 | pr_debug("usb %s: already deleted?\n", dev->bus_id); | 599 | pr_debug("usb %s: already deleted?\n", dev_name(dev)); |
600 | return -ENODEV; | 600 | return -ENODEV; |
601 | } | 601 | } |
602 | if (!usb_dev->bus) { | 602 | if (!usb_dev->bus) { |
603 | pr_debug("usb %s: bus removed?\n", dev->bus_id); | 603 | pr_debug("usb %s: bus removed?\n", dev_name(dev)); |
604 | return -ENODEV; | 604 | return -ENODEV; |
605 | } | 605 | } |
606 | 606 | ||
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c index fae55a31e26d..f600aec3fb3c 100644 --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c | |||
@@ -296,7 +296,7 @@ int usb_create_ep_files(struct device *parent, | |||
296 | retval = endpoint_get_minor(ep_dev); | 296 | retval = endpoint_get_minor(ep_dev); |
297 | if (retval) { | 297 | if (retval) { |
298 | dev_err(parent, "can not allocate minor number for %s\n", | 298 | dev_err(parent, "can not allocate minor number for %s\n", |
299 | ep_dev->dev.bus_id); | 299 | dev_name(&ep_dev->dev)); |
300 | goto error_register; | 300 | goto error_register; |
301 | } | 301 | } |
302 | 302 | ||
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index c6a95395e52a..913fb8667899 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c | |||
@@ -150,7 +150,7 @@ int usb_register_dev(struct usb_interface *intf, | |||
150 | int retval = -EINVAL; | 150 | int retval = -EINVAL; |
151 | int minor_base = class_driver->minor_base; | 151 | int minor_base = class_driver->minor_base; |
152 | int minor = 0; | 152 | int minor = 0; |
153 | char name[BUS_ID_SIZE]; | 153 | char name[20]; |
154 | char *temp; | 154 | char *temp; |
155 | 155 | ||
156 | #ifdef CONFIG_USB_DYNAMIC_MINORS | 156 | #ifdef CONFIG_USB_DYNAMIC_MINORS |
@@ -190,9 +190,9 @@ int usb_register_dev(struct usb_interface *intf, | |||
190 | intf->minor = minor; | 190 | intf->minor = minor; |
191 | 191 | ||
192 | /* create a usb class device for this usb interface */ | 192 | /* create a usb class device for this usb interface */ |
193 | snprintf(name, BUS_ID_SIZE, class_driver->name, minor - minor_base); | 193 | snprintf(name, sizeof(name), class_driver->name, minor - minor_base); |
194 | temp = strrchr(name, '/'); | 194 | temp = strrchr(name, '/'); |
195 | if (temp && (temp[1] != 0x00)) | 195 | if (temp && (temp[1] != '\0')) |
196 | ++temp; | 196 | ++temp; |
197 | else | 197 | else |
198 | temp = name; | 198 | temp = name; |
@@ -227,7 +227,7 @@ void usb_deregister_dev(struct usb_interface *intf, | |||
227 | struct usb_class_driver *class_driver) | 227 | struct usb_class_driver *class_driver) |
228 | { | 228 | { |
229 | int minor_base = class_driver->minor_base; | 229 | int minor_base = class_driver->minor_base; |
230 | char name[BUS_ID_SIZE]; | 230 | char name[20]; |
231 | 231 | ||
232 | #ifdef CONFIG_USB_DYNAMIC_MINORS | 232 | #ifdef CONFIG_USB_DYNAMIC_MINORS |
233 | minor_base = 0; | 233 | minor_base = 0; |
@@ -242,7 +242,7 @@ void usb_deregister_dev(struct usb_interface *intf, | |||
242 | usb_minors[intf->minor] = NULL; | 242 | usb_minors[intf->minor] = NULL; |
243 | up_write(&minor_rwsem); | 243 | up_write(&minor_rwsem); |
244 | 244 | ||
245 | snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base); | 245 | snprintf(name, sizeof(name), class_driver->name, intf->minor - minor_base); |
246 | device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor)); | 246 | device_destroy(usb_class->class, MKDEV(USB_MAJOR, intf->minor)); |
247 | intf->usb_dev = NULL; | 247 | intf->usb_dev = NULL; |
248 | intf->minor = -1; | 248 | intf->minor = -1; |
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 07f7bedf4dca..f7bfd72ef115 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -900,14 +900,14 @@ static int register_root_hub(struct usb_hcd *hcd) | |||
900 | if (retval != sizeof usb_dev->descriptor) { | 900 | if (retval != sizeof usb_dev->descriptor) { |
901 | mutex_unlock(&usb_bus_list_lock); | 901 | mutex_unlock(&usb_bus_list_lock); |
902 | dev_dbg (parent_dev, "can't read %s device descriptor %d\n", | 902 | dev_dbg (parent_dev, "can't read %s device descriptor %d\n", |
903 | usb_dev->dev.bus_id, retval); | 903 | dev_name(&usb_dev->dev), retval); |
904 | return (retval < 0) ? retval : -EMSGSIZE; | 904 | return (retval < 0) ? retval : -EMSGSIZE; |
905 | } | 905 | } |
906 | 906 | ||
907 | retval = usb_new_device (usb_dev); | 907 | retval = usb_new_device (usb_dev); |
908 | if (retval) { | 908 | if (retval) { |
909 | dev_err (parent_dev, "can't register root hub for %s, %d\n", | 909 | dev_err (parent_dev, "can't register root hub for %s, %d\n", |
910 | usb_dev->dev.bus_id, retval); | 910 | dev_name(&usb_dev->dev), retval); |
911 | } | 911 | } |
912 | mutex_unlock(&usb_bus_list_lock); | 912 | mutex_unlock(&usb_bus_list_lock); |
913 | 913 | ||
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index fe47d145255a..1141a4918e88 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1090,7 +1090,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0) | |||
1090 | if (!device_is_registered(&interface->dev)) | 1090 | if (!device_is_registered(&interface->dev)) |
1091 | continue; | 1091 | continue; |
1092 | dev_dbg(&dev->dev, "unregistering interface %s\n", | 1092 | dev_dbg(&dev->dev, "unregistering interface %s\n", |
1093 | interface->dev.bus_id); | 1093 | dev_name(&interface->dev)); |
1094 | device_del(&interface->dev); | 1094 | device_del(&interface->dev); |
1095 | usb_remove_sysfs_intf_files(interface); | 1095 | usb_remove_sysfs_intf_files(interface); |
1096 | } | 1096 | } |
@@ -1631,12 +1631,12 @@ free_interfaces: | |||
1631 | 1631 | ||
1632 | dev_dbg(&dev->dev, | 1632 | dev_dbg(&dev->dev, |
1633 | "adding %s (config #%d, interface %d)\n", | 1633 | "adding %s (config #%d, interface %d)\n", |
1634 | intf->dev.bus_id, configuration, | 1634 | dev_name(&intf->dev), configuration, |
1635 | intf->cur_altsetting->desc.bInterfaceNumber); | 1635 | intf->cur_altsetting->desc.bInterfaceNumber); |
1636 | ret = device_add(&intf->dev); | 1636 | ret = device_add(&intf->dev); |
1637 | if (ret != 0) { | 1637 | if (ret != 0) { |
1638 | dev_err(&dev->dev, "device_add(%s) --> %d\n", | 1638 | dev_err(&dev->dev, "device_add(%s) --> %d\n", |
1639 | intf->dev.bus_id, ret); | 1639 | dev_name(&intf->dev), ret); |
1640 | continue; | 1640 | continue; |
1641 | } | 1641 | } |
1642 | usb_create_sysfs_intf_files(intf); | 1642 | usb_create_sysfs_intf_files(intf); |
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 325774375837..3aca6d5afcdf 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c | |||
@@ -308,7 +308,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, | |||
308 | * by location for diagnostics, tools, driver model, etc. The | 308 | * by location for diagnostics, tools, driver model, etc. The |
309 | * string is a path along hub ports, from the root. Each device's | 309 | * string is a path along hub ports, from the root. Each device's |
310 | * dev->devpath will be stable until USB is re-cabled, and hubs | 310 | * dev->devpath will be stable until USB is re-cabled, and hubs |
311 | * are often labeled with these port numbers. The bus_id isn't | 311 | * are often labeled with these port numbers. The name isn't |
312 | * as stable: bus->busnum changes easily from modprobe order, | 312 | * as stable: bus->busnum changes easily from modprobe order, |
313 | * cardbus or pci hotplugging, and so on. | 313 | * cardbus or pci hotplugging, and so on. |
314 | */ | 314 | */ |
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 42036192a03c..b36ad240534c 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
@@ -1865,7 +1865,7 @@ static int dummy_hcd_probe(struct platform_device *pdev) | |||
1865 | 1865 | ||
1866 | dev_info(&pdev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc); | 1866 | dev_info(&pdev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc); |
1867 | 1867 | ||
1868 | hcd = usb_create_hcd(&dummy_hcd, &pdev->dev, pdev->dev.bus_id); | 1868 | hcd = usb_create_hcd(&dummy_hcd, &pdev->dev, dev_name(&pdev->dev)); |
1869 | if (!hcd) | 1869 | if (!hcd) |
1870 | return -ENOMEM; | 1870 | return -ENOMEM; |
1871 | the_controller = hcd_to_dummy (hcd); | 1871 | the_controller = hcd_to_dummy (hcd); |
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 4ce3950b997f..d3891b2fc36e 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -1642,7 +1642,7 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p) | |||
1642 | strlcpy(p->driver, shortname, sizeof p->driver); | 1642 | strlcpy(p->driver, shortname, sizeof p->driver); |
1643 | strlcpy(p->version, DRIVER_VERSION, sizeof p->version); | 1643 | strlcpy(p->version, DRIVER_VERSION, sizeof p->version); |
1644 | strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version); | 1644 | strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version); |
1645 | strlcpy (p->bus_info, dev->gadget->dev.bus_id, sizeof p->bus_info); | 1645 | strlcpy (p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info); |
1646 | } | 1646 | } |
1647 | 1647 | ||
1648 | static u32 eth_get_link(struct net_device *net) | 1648 | static u32 eth_get_link(struct net_device *net) |
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 47bb9f09a1aa..638cee03a24e 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c | |||
@@ -3868,7 +3868,7 @@ static int __init fsg_bind(struct usb_gadget *gadget) | |||
3868 | curlun->dev.driver = &fsg_driver.driver; | 3868 | curlun->dev.driver = &fsg_driver.driver; |
3869 | dev_set_drvdata(&curlun->dev, fsg); | 3869 | dev_set_drvdata(&curlun->dev, fsg); |
3870 | snprintf(curlun->dev.bus_id, BUS_ID_SIZE, | 3870 | snprintf(curlun->dev.bus_id, BUS_ID_SIZE, |
3871 | "%s-lun%d", gadget->dev.bus_id, i); | 3871 | "%s-lun%d", dev_name(&gadget->dev), i); |
3872 | 3872 | ||
3873 | if ((rc = device_register(&curlun->dev)) != 0) { | 3873 | if ((rc = device_register(&curlun->dev)) != 0) { |
3874 | INFO(fsg, "failed to register LUN%d: %d\n", i, rc); | 3874 | INFO(fsg, "failed to register LUN%d: %d\n", i, rc); |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index 825abd2621b3..c6e7df04c69a 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
@@ -1970,7 +1970,7 @@ static const struct usb_gadget_ops lh7a40x_udc_ops = { | |||
1970 | 1970 | ||
1971 | static void nop_release(struct device *dev) | 1971 | static void nop_release(struct device *dev) |
1972 | { | 1972 | { |
1973 | DEBUG("%s %s\n", __func__, dev->bus_id); | 1973 | DEBUG("%s %s\n", __func__, dev_name(dev)); |
1974 | } | 1974 | } |
1975 | 1975 | ||
1976 | static struct lh7a40x_udc memory = { | 1976 | static struct lh7a40x_udc memory = { |
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 031dceb93023..fbd6289977c8 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -1818,7 +1818,7 @@ pxa25x_udc_irq(int irq, void *_dev) | |||
1818 | 1818 | ||
1819 | static void nop_release (struct device *dev) | 1819 | static void nop_release (struct device *dev) |
1820 | { | 1820 | { |
1821 | DMSG("%s %s\n", __func__, dev->bus_id); | 1821 | DMSG("%s %s\n", __func__, dev_name(dev)); |
1822 | } | 1822 | } |
1823 | 1823 | ||
1824 | /* this uses load-time allocation and initialization (instead of | 1824 | /* this uses load-time allocation and initialization (instead of |
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c index 0f82fdcaef09..b0f8ed5a7fb9 100644 --- a/drivers/usb/host/ehci-dbg.c +++ b/drivers/usb/host/ehci-dbg.c | |||
@@ -676,7 +676,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
676 | "%s\n" | 676 | "%s\n" |
677 | "SUSPENDED (no register access)\n", | 677 | "SUSPENDED (no register access)\n", |
678 | hcd->self.controller->bus->name, | 678 | hcd->self.controller->bus->name, |
679 | hcd->self.controller->bus_id, | 679 | dev_name(hcd->self.controller), |
680 | hcd->product_desc); | 680 | hcd->product_desc); |
681 | goto done; | 681 | goto done; |
682 | } | 682 | } |
@@ -688,7 +688,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
688 | "%s\n" | 688 | "%s\n" |
689 | "EHCI %x.%02x, hcd state %d\n", | 689 | "EHCI %x.%02x, hcd state %d\n", |
690 | hcd->self.controller->bus->name, | 690 | hcd->self.controller->bus->name, |
691 | hcd->self.controller->bus_id, | 691 | dev_name(hcd->self.controller), |
692 | hcd->product_desc, | 692 | hcd->product_desc, |
693 | i >> 8, i & 0x0ff, hcd->state); | 693 | i >> 8, i & 0x0ff, hcd->state); |
694 | size -= temp; | 694 | size -= temp; |
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 7370d6187c64..f710a2d3423a 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c | |||
@@ -56,7 +56,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
56 | pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data; | 56 | pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data; |
57 | if (!pdata) { | 57 | if (!pdata) { |
58 | dev_err(&pdev->dev, | 58 | dev_err(&pdev->dev, |
59 | "No platform data for %s.\n", pdev->dev.bus_id); | 59 | "No platform data for %s.\n", dev_name(&pdev->dev)); |
60 | return -ENODEV; | 60 | return -ENODEV; |
61 | } | 61 | } |
62 | 62 | ||
@@ -69,7 +69,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
69 | (pdata->operating_mode == FSL_USB2_DR_OTG))) { | 69 | (pdata->operating_mode == FSL_USB2_DR_OTG))) { |
70 | dev_err(&pdev->dev, | 70 | dev_err(&pdev->dev, |
71 | "Non Host Mode configured for %s. Wrong driver linked.\n", | 71 | "Non Host Mode configured for %s. Wrong driver linked.\n", |
72 | pdev->dev.bus_id); | 72 | dev_name(&pdev->dev)); |
73 | return -ENODEV; | 73 | return -ENODEV; |
74 | } | 74 | } |
75 | 75 | ||
@@ -77,12 +77,12 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
77 | if (!res) { | 77 | if (!res) { |
78 | dev_err(&pdev->dev, | 78 | dev_err(&pdev->dev, |
79 | "Found HC with no IRQ. Check %s setup!\n", | 79 | "Found HC with no IRQ. Check %s setup!\n", |
80 | pdev->dev.bus_id); | 80 | dev_name(&pdev->dev)); |
81 | return -ENODEV; | 81 | return -ENODEV; |
82 | } | 82 | } |
83 | irq = res->start; | 83 | irq = res->start; |
84 | 84 | ||
85 | hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id); | 85 | hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev)); |
86 | if (!hcd) { | 86 | if (!hcd) { |
87 | retval = -ENOMEM; | 87 | retval = -ENOMEM; |
88 | goto err1; | 88 | goto err1; |
@@ -92,7 +92,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
92 | if (!res) { | 92 | if (!res) { |
93 | dev_err(&pdev->dev, | 93 | dev_err(&pdev->dev, |
94 | "Found HC with no register addr. Check %s setup!\n", | 94 | "Found HC with no register addr. Check %s setup!\n", |
95 | pdev->dev.bus_id); | 95 | dev_name(&pdev->dev)); |
96 | retval = -ENODEV; | 96 | retval = -ENODEV; |
97 | goto err2; | 97 | goto err2; |
98 | } | 98 | } |
@@ -132,7 +132,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
132 | err2: | 132 | err2: |
133 | usb_put_hcd(hcd); | 133 | usb_put_hcd(hcd); |
134 | err1: | 134 | err1: |
135 | dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, retval); | 135 | dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval); |
136 | return retval; | 136 | return retval; |
137 | } | 137 | } |
138 | 138 | ||
diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c index 9d042f220097..f9575c409124 100644 --- a/drivers/usb/host/ehci-ixp4xx.c +++ b/drivers/usb/host/ehci-ixp4xx.c | |||
@@ -77,12 +77,12 @@ static int ixp4xx_ehci_probe(struct platform_device *pdev) | |||
77 | if (!res) { | 77 | if (!res) { |
78 | dev_err(&pdev->dev, | 78 | dev_err(&pdev->dev, |
79 | "Found HC with no IRQ. Check %s setup!\n", | 79 | "Found HC with no IRQ. Check %s setup!\n", |
80 | pdev->dev.bus_id); | 80 | dev_name(&pdev->dev)); |
81 | return -ENODEV; | 81 | return -ENODEV; |
82 | } | 82 | } |
83 | irq = res->start; | 83 | irq = res->start; |
84 | 84 | ||
85 | hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id); | 85 | hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev)); |
86 | if (!hcd) { | 86 | if (!hcd) { |
87 | retval = -ENOMEM; | 87 | retval = -ENOMEM; |
88 | goto fail_create_hcd; | 88 | goto fail_create_hcd; |
@@ -92,7 +92,7 @@ static int ixp4xx_ehci_probe(struct platform_device *pdev) | |||
92 | if (!res) { | 92 | if (!res) { |
93 | dev_err(&pdev->dev, | 93 | dev_err(&pdev->dev, |
94 | "Found HC with no register addr. Check %s setup!\n", | 94 | "Found HC with no register addr. Check %s setup!\n", |
95 | pdev->dev.bus_id); | 95 | dev_name(&pdev->dev)); |
96 | retval = -ENODEV; | 96 | retval = -ENODEV; |
97 | goto fail_request_resource; | 97 | goto fail_request_resource; |
98 | } | 98 | } |
@@ -126,7 +126,7 @@ fail_ioremap: | |||
126 | fail_request_resource: | 126 | fail_request_resource: |
127 | usb_put_hcd(hcd); | 127 | usb_put_hcd(hcd); |
128 | fail_create_hcd: | 128 | fail_create_hcd: |
129 | dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, retval); | 129 | dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval); |
130 | return retval; | 130 | return retval; |
131 | } | 131 | } |
132 | 132 | ||
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index ab625f0ba1d9..5fbdc14e63b3 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -204,7 +204,7 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev) | |||
204 | if (irq <= 0) { | 204 | if (irq <= 0) { |
205 | dev_err(&pdev->dev, | 205 | dev_err(&pdev->dev, |
206 | "Found HC with no IRQ. Check %s setup!\n", | 206 | "Found HC with no IRQ. Check %s setup!\n", |
207 | pdev->dev.bus_id); | 207 | dev_name(&pdev->dev)); |
208 | err = -ENODEV; | 208 | err = -ENODEV; |
209 | goto err1; | 209 | goto err1; |
210 | } | 210 | } |
@@ -213,7 +213,7 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev) | |||
213 | if (!res) { | 213 | if (!res) { |
214 | dev_err(&pdev->dev, | 214 | dev_err(&pdev->dev, |
215 | "Found HC with no register addr. Check %s setup!\n", | 215 | "Found HC with no register addr. Check %s setup!\n", |
216 | pdev->dev.bus_id); | 216 | dev_name(&pdev->dev)); |
217 | err = -ENODEV; | 217 | err = -ENODEV; |
218 | goto err1; | 218 | goto err1; |
219 | } | 219 | } |
@@ -233,7 +233,7 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev) | |||
233 | } | 233 | } |
234 | 234 | ||
235 | hcd = usb_create_hcd(&ehci_orion_hc_driver, | 235 | hcd = usb_create_hcd(&ehci_orion_hc_driver, |
236 | &pdev->dev, pdev->dev.bus_id); | 236 | &pdev->dev, dev_name(&pdev->dev)); |
237 | if (!hcd) { | 237 | if (!hcd) { |
238 | err = -ENOMEM; | 238 | err = -ENOMEM; |
239 | goto err3; | 239 | goto err3; |
@@ -276,7 +276,7 @@ err2: | |||
276 | release_mem_region(res->start, res->end - res->start + 1); | 276 | release_mem_region(res->start, res->end - res->start + 1); |
277 | err1: | 277 | err1: |
278 | dev_err(&pdev->dev, "init %s fail, %d\n", | 278 | dev_err(&pdev->dev, "init %s fail, %d\n", |
279 | pdev->dev.bus_id, err); | 279 | dev_name(&pdev->dev), err); |
280 | 280 | ||
281 | return err; | 281 | return err; |
282 | } | 282 | } |
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c index 37e6abeb794c..0eba894bcb01 100644 --- a/drivers/usb/host/ehci-ps3.c +++ b/drivers/usb/host/ehci-ps3.c | |||
@@ -128,7 +128,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) | |||
128 | 128 | ||
129 | dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */ | 129 | dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */ |
130 | 130 | ||
131 | hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev->core.bus_id); | 131 | hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev_name(&dev->core)); |
132 | 132 | ||
133 | if (!hcd) { | 133 | if (!hcd) { |
134 | dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, | 134 | dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, |
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 20b9a0d07420..109dee82a376 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -1592,7 +1592,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev) | |||
1592 | } | 1592 | } |
1593 | 1593 | ||
1594 | /* allocate and initialize hcd */ | 1594 | /* allocate and initialize hcd */ |
1595 | hcd = usb_create_hcd(&isp116x_hc_driver, &pdev->dev, pdev->dev.bus_id); | 1595 | hcd = usb_create_hcd(&isp116x_hc_driver, &pdev->dev, dev_name(&pdev->dev)); |
1596 | if (!hcd) { | 1596 | if (!hcd) { |
1597 | ret = -ENOMEM; | 1597 | ret = -ENOMEM; |
1598 | goto err5; | 1598 | goto err5; |
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index c9db3fe98726..ad833661ff34 100644 --- a/drivers/usb/host/isp1760-if.c +++ b/drivers/usb/host/isp1760-if.c | |||
@@ -41,7 +41,7 @@ static int of_isp1760_probe(struct of_device *dev, | |||
41 | return -ENXIO; | 41 | return -ENXIO; |
42 | 42 | ||
43 | res = request_mem_region(memory.start, memory.end - memory.start + 1, | 43 | res = request_mem_region(memory.start, memory.end - memory.start + 1, |
44 | dev->dev.bus_id); | 44 | dev_name(&dev->dev)); |
45 | if (!res) | 45 | if (!res) |
46 | return -EBUSY; | 46 | return -EBUSY; |
47 | 47 | ||
@@ -56,7 +56,7 @@ static int of_isp1760_probe(struct of_device *dev, | |||
56 | oirq.size); | 56 | oirq.size); |
57 | 57 | ||
58 | hcd = isp1760_register(memory.start, res_len, virq, | 58 | hcd = isp1760_register(memory.start, res_len, virq, |
59 | IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev->dev.bus_id); | 59 | IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev)); |
60 | if (IS_ERR(hcd)) { | 60 | if (IS_ERR(hcd)) { |
61 | ret = PTR_ERR(hcd); | 61 | ret = PTR_ERR(hcd); |
62 | goto release_reg; | 62 | goto release_reg; |
@@ -200,7 +200,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev, | |||
200 | 200 | ||
201 | dev->dev.dma_mask = NULL; | 201 | dev->dev.dma_mask = NULL; |
202 | hcd = isp1760_register(pci_mem_phy0, length, dev->irq, | 202 | hcd = isp1760_register(pci_mem_phy0, length, dev->irq, |
203 | IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev->dev.bus_id); | 203 | IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev)); |
204 | pci_set_drvdata(dev, hcd); | 204 | pci_set_drvdata(dev, hcd); |
205 | if (!hcd) | 205 | if (!hcd) |
206 | return 0; | 206 | return 0; |
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c index e06bfaebec54..7cef1d2f7ccc 100644 --- a/drivers/usb/host/ohci-dbg.c +++ b/drivers/usb/host/ohci-dbg.c | |||
@@ -651,7 +651,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
651 | "%s\n" | 651 | "%s\n" |
652 | "%s version " DRIVER_VERSION "\n", | 652 | "%s version " DRIVER_VERSION "\n", |
653 | hcd->self.controller->bus->name, | 653 | hcd->self.controller->bus->name, |
654 | hcd->self.controller->bus_id, | 654 | dev_name(hcd->self.controller), |
655 | hcd->product_desc, | 655 | hcd->product_desc, |
656 | hcd_name); | 656 | hcd_name); |
657 | 657 | ||
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index a19a4f80a6e1..6e5e5f81ac90 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -329,7 +329,7 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, | |||
329 | } | 329 | } |
330 | 330 | ||
331 | 331 | ||
332 | hcd = usb_create_hcd (driver, &pdev->dev, pdev->dev.bus_id); | 332 | hcd = usb_create_hcd (driver, &pdev->dev, dev_name(&pdev->dev)); |
333 | if (!hcd) { | 333 | if (!hcd) { |
334 | retval = -ENOMEM; | 334 | retval = -ENOMEM; |
335 | goto err0; | 335 | goto err0; |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 28b458f20cc3..7062ab5feecd 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -389,7 +389,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) | |||
389 | while ((__raw_readl(USB_OTG_CLK_STAT) & USB_CLOCK_MASK) != | 389 | while ((__raw_readl(USB_OTG_CLK_STAT) & USB_CLOCK_MASK) != |
390 | USB_CLOCK_MASK) ; | 390 | USB_CLOCK_MASK) ; |
391 | 391 | ||
392 | hcd = usb_create_hcd (driver, &pdev->dev, pdev->dev.bus_id); | 392 | hcd = usb_create_hcd (driver, &pdev->dev, dev_name(&pdev->dev)); |
393 | if (!hcd) { | 393 | if (!hcd) { |
394 | err("Failed to allocate HC buffer"); | 394 | err("Failed to allocate HC buffer"); |
395 | ret = -ENOMEM; | 395 | ret = -ENOMEM; |
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index c1935ae537f8..55c95647f008 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c | |||
@@ -129,7 +129,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev) | |||
129 | 129 | ||
130 | dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */ | 130 | dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */ |
131 | 131 | ||
132 | hcd = usb_create_hcd(&ps3_ohci_hc_driver, &dev->core, dev->core.bus_id); | 132 | hcd = usb_create_hcd(&ps3_ohci_hc_driver, &dev->core, dev_name(&dev->core)); |
133 | 133 | ||
134 | if (!hcd) { | 134 | if (!hcd) { |
135 | dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, | 135 | dev_dbg(&dev->core, "%s:%d: usb_create_hcd failed\n", __func__, |
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index e610698c6b60..21b164e4abeb 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c | |||
@@ -143,7 +143,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev) | |||
143 | goto err2; | 143 | goto err2; |
144 | } | 144 | } |
145 | 145 | ||
146 | hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id); | 146 | hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev)); |
147 | if (!hcd) { | 147 | if (!hcd) { |
148 | retval = -ENOMEM; | 148 | retval = -ENOMEM; |
149 | goto err2; | 149 | goto err2; |
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c index 7275186db315..3660c83d80af 100644 --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c | |||
@@ -113,7 +113,7 @@ static int ssb_ohci_attach(struct ssb_device *dev) | |||
113 | ssb_device_enable(dev, flags); | 113 | ssb_device_enable(dev, flags); |
114 | 114 | ||
115 | hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev, | 115 | hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev, |
116 | dev->dev->bus_id); | 116 | dev_name(dev->dev)); |
117 | if (!hcd) | 117 | if (!hcd) |
118 | goto err_dev_disable; | 118 | goto err_dev_disable; |
119 | ohcidev = hcd_to_ssb_ohci(hcd); | 119 | ohcidev = hcd_to_ssb_ohci(hcd); |
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index 426575247b23..340d72da554a 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c | |||
@@ -1674,7 +1674,7 @@ sl811h_probe(struct platform_device *dev) | |||
1674 | } | 1674 | } |
1675 | 1675 | ||
1676 | /* allocate and initialize hcd */ | 1676 | /* allocate and initialize hcd */ |
1677 | hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev->dev.bus_id); | 1677 | hcd = usb_create_hcd(&sl811h_hc_driver, &dev->dev, dev_name(&dev->dev)); |
1678 | if (!hcd) { | 1678 | if (!hcd) { |
1679 | retval = -ENOMEM; | 1679 | retval = -ENOMEM; |
1680 | goto err5; | 1680 | goto err5; |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 9b6323f768b2..20ad3c48fcb2 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -3124,7 +3124,7 @@ static int __devinit u132_probe(struct platform_device *pdev) | |||
3124 | if (pdev->dev.dma_mask) | 3124 | if (pdev->dev.dma_mask) |
3125 | return -EINVAL; | 3125 | return -EINVAL; |
3126 | 3126 | ||
3127 | hcd = usb_create_hcd(&u132_hc_driver, &pdev->dev, pdev->dev.bus_id); | 3127 | hcd = usb_create_hcd(&u132_hc_driver, &pdev->dev, dev_name(&pdev->dev)); |
3128 | if (!hcd) { | 3128 | if (!hcd) { |
3129 | printk(KERN_ERR "failed to create the usb hcd struct for U132\n" | 3129 | printk(KERN_ERR "failed to create the usb hcd struct for U132\n" |
3130 | ); | 3130 | ); |
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 0cb0d77dc429..b4620c009d18 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -505,7 +505,7 @@ static void port_release(struct device *dev) | |||
505 | { | 505 | { |
506 | struct usb_serial_port *port = to_usb_serial_port(dev); | 506 | struct usb_serial_port *port = to_usb_serial_port(dev); |
507 | 507 | ||
508 | dbg ("%s - %s", __func__, dev->bus_id); | 508 | dbg ("%s - %s", __func__, dev_name(dev)); |
509 | port_free(port); | 509 | port_free(port); |
510 | } | 510 | } |
511 | 511 | ||
@@ -939,7 +939,7 @@ int usb_serial_probe(struct usb_interface *interface, | |||
939 | port->dev.release = &port_release; | 939 | port->dev.release = &port_release; |
940 | 940 | ||
941 | snprintf (&port->dev.bus_id[0], sizeof(port->dev.bus_id), "ttyUSB%d", port->number); | 941 | snprintf (&port->dev.bus_id[0], sizeof(port->dev.bus_id), "ttyUSB%d", port->number); |
942 | dbg ("%s - registering %s", __func__, port->dev.bus_id); | 942 | dbg ("%s - registering %s", __func__, dev_name(&port->dev)); |
943 | retval = device_register(&port->dev); | 943 | retval = device_register(&port->dev); |
944 | if (retval) | 944 | if (retval) |
945 | dev_err(&port->dev, "Error registering port device, " | 945 | dev_err(&port->dev, "Error registering port device, " |