diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2015-11-17 19:24:15 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2015-11-26 04:08:47 +0100 |
| commit | c48442d1277a9b9e20ad38c29ca68485b921d4e9 (patch) | |
| tree | 0a5be78e35f3255d8b92efaffda76433f8c90eff /drivers/scsi | |
| parent | atp870u: Use n_io_port in request_region and release_region (diff) | |
| download | linux-c48442d1277a9b9e20ad38c29ca68485b921d4e9.tar.xz linux-c48442d1277a9b9e20ad38c29ca68485b921d4e9.zip | |
atp870u: Remove useless and broken card counting
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')
| -rw-r--r-- | drivers/scsi/atp870u.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index a06a0a4db71c..0b349bc4e6e6 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c @@ -1250,7 +1250,6 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) struct Scsi_Host *shpnt = NULL; struct atp_unit *atpdev, *p; unsigned char setupdata[2][16]; - int count = 0; atpdev = kzalloc(sizeof(*atpdev), GFP_KERNEL); if (!atpdev) @@ -1298,8 +1297,8 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) host_id = atp_readb_base(atpdev, 0x39); host_id >>= 0x04; - printk(KERN_INFO " ACARD AEC-67160 PCI Ultra3 LVD Host Adapter: %d" - " IO:%x, IRQ:%d.\n", count, base_io, pdev->irq); + printk(KERN_INFO " ACARD AEC-67160 PCI Ultra3 LVD Host Adapter:" + " IO:%x, IRQ:%d.\n", base_io, pdev->irq); atpdev->dev_id = ent->device; atpdev->host_id[0] = host_id; @@ -1546,8 +1545,8 @@ flash_ok_885: } else { error = pci_read_config_byte(pdev, 0x49, &host_id); - printk(KERN_INFO " ACARD AEC-671X PCI Ultra/W SCSI-2/3 Host Adapter: %d " - "IO:%x, IRQ:%d.\n", count, base_io, pdev->irq); + printk(KERN_INFO " ACARD AEC-671X PCI Ultra/W SCSI-2/3 Host Adapter: " + "IO:%x, IRQ:%d.\n", base_io, pdev->irq); atpdev->ioport[0] = base_io; atpdev->pciport[0] = base_io + 0x20; @@ -1612,7 +1611,6 @@ flash_ok_885: spin_unlock_irqrestore(shpnt->host_lock, flags); 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; scsi_scan_host(shpnt); |