mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
atp870u: Use n_io_port in request_region and release_region
Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Hannes Reinicke <hare@suse.de> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
1ccd7d68fc
commit
30ebc7efcf
1 changed files with 3 additions and 17 deletions
|
@ -1610,16 +1610,8 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
shpnt->irq = pdev->irq;
|
||||
}
|
||||
spin_unlock_irqrestore(shpnt->host_lock, flags);
|
||||
if(ent->device==ATP885_DEVID) {
|
||||
if(!request_region(base_io, 0xff, "atp870u")) /* Register the IO ports that we use */
|
||||
goto request_io_fail;
|
||||
} else if((ent->device==ATP880_DEVID1)||(ent->device==ATP880_DEVID2)) {
|
||||
if(!request_region(base_io, 0x60, "atp870u")) /* Register the IO ports that we use */
|
||||
goto request_io_fail;
|
||||
} else {
|
||||
if(!request_region(base_io, 0x40, "atp870u")) /* Register the IO ports that we use */
|
||||
goto request_io_fail;
|
||||
}
|
||||
if (!request_region(base_io, shpnt->n_io_port, "atp870u"))
|
||||
goto request_io_fail;
|
||||
count++;
|
||||
if (scsi_add_host(shpnt, &pdev->dev))
|
||||
goto scsi_add_fail;
|
||||
|
@ -1631,13 +1623,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
|
||||
scsi_add_fail:
|
||||
printk("atp870u_prob:scsi_add_fail\n");
|
||||
if(ent->device==ATP885_DEVID) {
|
||||
release_region(base_io, 0xff);
|
||||
} else if((ent->device==ATP880_DEVID1)||(ent->device==ATP880_DEVID2)) {
|
||||
release_region(base_io, 0x60);
|
||||
} else {
|
||||
release_region(base_io, 0x40);
|
||||
}
|
||||
release_region(base_io, shpnt->n_io_port);
|
||||
request_io_fail:
|
||||
printk("atp870u_prob:request_io_fail\n");
|
||||
free_irq(pdev->irq, shpnt);
|
||||
|
|
Loading…
Reference in a new issue