diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-06 19:52:53 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-07 12:59:52 -0500 |
commit | 427c4f333474f5447f62387c1fb060e586c1a781 (patch) | |
tree | 04aada64f2a30eea745a9f2d083a56680e5041d4 /drivers/usb/musb/musb_core.c | |
parent | 796bcae7361c28cf825780f6f1aac9dd3411394e (diff) |
usb: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb/musb_core.c')
-rw-r--r-- | drivers/usb/musb/musb_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 5280dba9b1fb..0b742ebe5c8c 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
@@ -1781,7 +1781,7 @@ allocate_instance(struct device *dev, | |||
1781 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | 1781 | #ifdef CONFIG_USB_MUSB_HDRC_HCD |
1782 | struct usb_hcd *hcd; | 1782 | struct usb_hcd *hcd; |
1783 | 1783 | ||
1784 | hcd = usb_create_hcd(&musb_hc_driver, dev, dev->bus_id); | 1784 | hcd = usb_create_hcd(&musb_hc_driver, dev, dev_name(dev)); |
1785 | if (!hcd) | 1785 | if (!hcd) |
1786 | return NULL; | 1786 | return NULL; |
1787 | /* usbcore sets dev->driver_data to hcd, and sometimes uses that... */ | 1787 | /* usbcore sets dev->driver_data to hcd, and sometimes uses that... */ |
@@ -1984,7 +1984,7 @@ bad_config: | |||
1984 | INIT_WORK(&musb->irq_work, musb_irq_work); | 1984 | INIT_WORK(&musb->irq_work, musb_irq_work); |
1985 | 1985 | ||
1986 | /* attach to the IRQ */ | 1986 | /* attach to the IRQ */ |
1987 | if (request_irq(nIrq, musb->isr, 0, dev->bus_id, musb)) { | 1987 | if (request_irq(nIrq, musb->isr, 0, dev_name(dev), musb)) { |
1988 | dev_err(dev, "request_irq %d failed!\n", nIrq); | 1988 | dev_err(dev, "request_irq %d failed!\n", nIrq); |
1989 | status = -ENODEV; | 1989 | status = -ENODEV; |
1990 | goto fail2; | 1990 | goto fail2; |