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

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

atp870u: Remove scam_on from struct atp_unit



scam_on is used only during probe, no need to keep it later.

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 1729c0d2
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ static unsigned char fun_scam(struct atp_unit *dev, unsigned short int *val)
	return j;
}

static void tscam(struct Scsi_Host *host, bool wide_chip)
static void tscam(struct Scsi_Host *host, bool wide_chip, u8 scam_on)
{

	unsigned char i, j, k;
@@ -986,7 +986,7 @@ static void tscam(struct Scsi_Host *host, bool wide_chip)
	atp_writeb_io(dev, 0, 2, 0x7f);
	atp_writeb_io(dev, 0, 0x11, 0x20);

	if ((dev->scam_on & 0x40) == 0) {
	if ((scam_on & 0x40) == 0) {
		return;
	}
	m = 1;
@@ -1311,7 +1311,6 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
			"    IO:%lx, IRQ:%d.\n", shpnt->io_port, shpnt->irq);
		atpdev->host_id[0] = host_id;

		atpdev->scam_on = atp_readb_base(atpdev, 0x22);
		atpdev->global_map[0] = atp_readb_base(atpdev, 0x35);
		atpdev->ultra_map[0] = atp_readw_base(atpdev, 0x3c);

@@ -1384,7 +1383,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

		atp_set_host_id(atpdev, 0, host_id);

		tscam(shpnt, true);
		tscam(shpnt, true, atp_readb_base(atpdev, 0x22));
		atp_is(atpdev, 0, true, atp_readb_base(atpdev, 0x3f) & 0x40);
		atp_writeb_base(atpdev, 0x38, 0xb0);
		shpnt->max_id = 16;
@@ -1509,6 +1508,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
		shpnt->max_channel = 1;
		shpnt->this_id = atpdev->host_id[0];
	} else {
		u8 scam_on;
		bool wide_chip =
			(ent->device == PCI_DEVICE_ID_ARTOP_AEC7610 &&
			 pdev->revision == 4) ||
@@ -1523,12 +1523,12 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
		atpdev->pciport[0] = shpnt->io_port + 0x20;
		host_id &= 0x07;
		atpdev->host_id[0] = host_id;
		atpdev->scam_on = atp_readb_pci(atpdev, 0, 2);
		scam_on = atp_readb_pci(atpdev, 0, 2);
		atpdev->global_map[0] = atp_readb_base(atpdev, 0x2d);
		atpdev->ultra_map[0] = atp_readw_base(atpdev, 0x2e);

		if (atpdev->ultra_map[0] == 0) {
			atpdev->scam_on = 0x00;
			scam_on = 0x00;
			atpdev->global_map[0] = 0x20;
			atpdev->ultra_map[0] = 0xffff;
		}
@@ -1551,7 +1551,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
		atp_set_host_id(atpdev, 0, host_id);


		tscam(shpnt, wide_chip);
		tscam(shpnt, wide_chip, scam_on);
		atp_writeb_base(atpdev, 0x3a, atp_readb_base(atpdev, 0x3a) | 0x10);
		atp_is(atpdev, 0, wide_chip, 0);
		atp_writeb_base(atpdev, 0x3a, atp_readb_base(atpdev, 0x3a) & 0xef);
+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ struct atp_unit
	unsigned char quhd[2];
	unsigned char quend[2];
	unsigned char global_map[2];
	unsigned char scam_on;
	unsigned char host_id[2];
	unsigned int working[2];
	unsigned short wide_id[2];