aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/isp1760-if.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-05-02 00:02:41 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-21 18:15:46 -0400
commit7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005 (patch)
tree6e269adae8630b505a69efd0b8351440ef6b69b8 /drivers/usb/host/isp1760-if.c
parent36aa81172edba8a3a8ecedbd1f56d41774ce2e08 (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/isp1760-if.c')
-rw-r--r--drivers/usb/host/isp1760-if.c6
1 files changed, 3 insertions, 3 deletions
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;