diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2015-11-17 19:24:14 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2015-11-25 22:08:47 -0500 |
| commit | 30ebc7efcf5cf653ec2f5567d9fce2b4e1247ab7 (patch) | |
| tree | 8ebb43d0b4126a0ac38dc618711c04c8ab30722d /drivers/scsi/atp870u.c | |
| parent | 1ccd7d68fc3004e3ed111753e62385176fa28f40 (diff) | |
| download | linux-stable-30ebc7efcf5cf653ec2f5567d9fce2b4e1247ab7.tar.gz linux-stable-30ebc7efcf5cf653ec2f5567d9fce2b4e1247ab7.tar.bz2 linux-stable-30ebc7efcf5cf653ec2f5567d9fce2b4e1247ab7.zip | |
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>
Diffstat (limited to 'drivers/scsi/atp870u.c')
| -rw-r--r-- | drivers/scsi/atp870u.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index 7f53a50a0ab4..a06a0a4db71c 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c @@ -1610,16 +1610,8 @@ flash_ok_885: 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 @@ flash_ok_885: 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); |