USB: usb dev_name() instead of dev->bus_id

[linux-2.6-omap-h63xx.git] / drivers / usb / host / isp1760-if.c

diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 73fb2a38f1e40dd594549bd6d797ae6eba2a1216..ad833661ff34f14ff38025c9b87ef7b419bc389c 100644 (file)
--- 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;
@@ -104,8 +104,8 @@ static u32 nxp_pci_io_base;
 static u32 iolength;
 static u32 pci_mem_phy0;
 static u32 length;
-static u8 *chip_addr;
-static u8 *iobase;
+static u8 __iomem *chip_addr;
+static u8 __iomem *iobase;
 
 static int __devinit isp1761_pci_probe(struct pci_dev *dev,
                const struct pci_device_id *id)
@@ -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;
@@ -256,7 +256,7 @@ static struct pci_driver isp1761_pci_driver = {
 
 static int __init isp1760_init(void)
 {
-       int ret;
+       int ret = -ENODEV;
 
        init_kmem_once();