openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] initio: Fix merge fallout 

Fix IRQ reporting - just assign the ->pci_dev pointer earlier and use the
pci_dev irq field rather than keeping a private one

Init the spinlock as it works better on SMP that way

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Alan Cox 2007-10-15 20:51:32 +01:00 committed by James Bottomley
parent 0fec02c93f
commit e9e42faf47
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/initio.c
View File

@ -665,7 +665,7 @@ static void initio_init(struct initio_host * host, u8 *bios_addr)
host->max_tags[i] = 0xFF; host->max_tags[i] = 0xFF;
} /* for */ } /* for */
printk("i91u: PCI Base=0x%04X, IRQ=%d, BIOS=0x%04X0, SCSI ID=%d\n", printk("i91u: PCI Base=0x%04X, IRQ=%d, BIOS=0x%04X0, SCSI ID=%d\n",
host->addr, host->irq, host->addr, host->pci_dev->irq,
host->bios_addr, host->scsi_id); host->bios_addr, host->scsi_id);
/* Reset SCSI Bus */ /* Reset SCSI Bus */
if (host->config & HCC_SCSI_RESET) { if (host->config & HCC_SCSI_RESET) {
@ -2891,6 +2891,8 @@ static int initio_probe_one(struct pci_dev *pdev,
goto out_release_region; goto out_release_region;
} }
host->pci_dev = pdev;
host->num_scbs = num_scb; host->num_scbs = num_scb;
host->scb = scb; host->scb = scb;
host->next_pending = scb; host->next_pending = scb;
@ -2905,6 +2907,7 @@ static int initio_probe_one(struct pci_dev *pdev,
host->scb_end = tmp; host->scb_end = tmp;
host->first_avail = scb; host->first_avail = scb;
host->last_avail = prev; host->last_avail = prev;
spin_lock_init(&host->avail_lock);
initio_init(host, phys_to_virt(bios_seg << 4)); initio_init(host, phys_to_virt(bios_seg << 4));
@ -2928,7 +2931,6 @@ static int initio_probe_one(struct pci_dev *pdev,
} }
pci_set_drvdata(pdev, shost); pci_set_drvdata(pdev, shost);
host->pci_dev = pdev;
error = scsi_add_host(shost, &pdev->dev); error = scsi_add_host(shost, &pdev->dev);
if (error) if (error)