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 /drivers/usb/host/ehci-orion.c | |
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>
Diffstat (limited to 'drivers/usb/host/ehci-orion.c')
-rw-r--r-- | drivers/usb/host/ehci-orion.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 | } |