Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c48442d1 authored by Ondrej Zary's avatar Ondrej Zary Committed by Martin K. Petersen
Browse files

atp870u: Remove useless and broken card counting 



Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Reviewed-by: default avatarHannes Reinicke <hare@suse.de>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 30ebc7ef

drivers/scsi/atp870u.c

+4 −6
Original line number Diff line number Diff line
@@ -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 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	} 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 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		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);