diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-05-02 06:02:41 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 15:15:46 -0700 |
commit | 7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005 (patch) | |
tree | 6e269adae8630b505a69efd0b8351440ef6b69b8 /drivers/usb/host/isp1760-if.c | |
parent | 36aa81172edba8a3a8ecedbd1f56d41774ce2e08 (diff) | |
download | op-kernel-dev-7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005.zip op-kernel-dev-7071a3ce0ca058ad2a9e3e8c33f30fb0bce62005.tar.gz |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index c9db3fe..ad83366 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, return -ENXIO; res = request_mem_region(memory.start, memory.end - memory.start + 1, - dev->dev.bus_id); + dev_name(&dev->dev)); if (!res) return -EBUSY; @@ -56,7 +56,7 @@ static int of_isp1760_probe(struct of_device *dev, oirq.size); hcd = isp1760_register(memory.start, res_len, virq, - IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev->dev.bus_id); + IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev)); if (IS_ERR(hcd)) { ret = PTR_ERR(hcd); goto release_reg; @@ -200,7 +200,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev, dev->dev.dma_mask = NULL; hcd = isp1760_register(pci_mem_phy0, length, dev->irq, - IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev->dev.bus_id); + IRQF_SHARED | IRQF_DISABLED, &dev->dev, dev_name(&dev->dev)); pci_set_drvdata(dev, hcd); if (!hcd) return 0; |