Skip to content

L
linux
Commit c1098462 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

aha1740: work around 'name' field removal.

parent 4f531b3d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
drivers/scsi/aha1740.c
View file @ c1098462
...@@ -602,8 +602,8 @@ static int aha1740_probe (struct device *dev) ...@@ -602,8 +602,8 @@ static int aha1740_probe (struct device *dev)
outb(G2CNTRL_HRST, G2CNTRL(slotbase)); outb(G2CNTRL_HRST, G2CNTRL(slotbase));
outb(0, G2CNTRL(slotbase)); outb(0, G2CNTRL(slotbase));
} }
printk(KERN_INFO "Configuring %s at IO:%x, IRQ %d\n", printk(KERN_INFO "Configuring slot %d at IO:%x, IRQ %d\n",
dev->name, slotbase, irq_level); edev->slot, slotbase, irq_level);
printk(KERN_INFO "aha174x: Extended translation %sabled.\n", printk(KERN_INFO "aha174x: Extended translation %sabled.\n",
translation ? "en" : "dis"); translation ? "en" : "dis");
shpnt = scsi_host_alloc(&aha1740_template, shpnt = scsi_host_alloc(&aha1740_template,
...@@ -656,8 +656,7 @@ static __devexit int aha1740_remove (struct device *dev) ...@@ -656,8 +656,7 @@ static __devexit int aha1740_remove (struct device *dev)
struct Scsi_Host *shpnt = dev->driver_data; struct Scsi_Host *shpnt = dev->driver_data;
struct aha1740_hostdata *host = HOSTDATA (shpnt); struct aha1740_hostdata *host = HOSTDATA (shpnt);
if (scsi_remove_host (shpnt)) scsi_remove_host(shpnt);
return -EBUSY;
free_irq (shpnt->irq, shpnt); free_irq (shpnt->irq, shpnt);
dma_unmap_single (dev, host->ecb_dma_addr, dma_unmap_single (dev, host->ecb_dma_addr,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7