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

atp870u: Move 870-specific code out of is870() 



Move few remaining 870-specific code lines out of is870()

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 460da918

drivers/scsi/atp870u.c

+2 −3
Original line number Diff line number Diff line
@@ -1174,8 +1174,6 @@ static void is870(struct atp_unit *dev, unsigned char c, bool wide_chip) 
	static unsigned char synw[6] = { 0x80, 1, 3, 1, 0x0c, 0x07 };

	static unsigned char wide[6] = { 0x80, 1, 2, 3, 1, 0 };



	atp_writeb_io(dev, c, 0x3a, atp_readb_io(dev, c, 0x3a) | 0x10);



	for (i = 0; i < 16; i++) {

		if (!wide_chip && (i > 7))

			break;
@@ -1587,7 +1585,6 @@ tar_dcons: 
set_syn_ok:

		dev->id[c][i].devsp = (dev->id[c][i].devsp & 0x0f) | j;

	}

	atp_writeb_io(dev, c, 0x3a, atp_readb_io(dev, c, 0x3a) & 0xef);

}



static void atp870u_free_tables(struct Scsi_Host *host)
@@ -2032,7 +2029,9 @@ flash_ok_885: 
		outb(0x20, base_io + 0x11);



		tscam(shpnt);

		atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) | 0x10);

		is870(p, 0, p->chip_ver == 4);

		atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) & 0xef);

		outb((inb(base_io + 0x3a) & 0xef), base_io + 0x3a);

		outb((inb(base_io + 0x3b) | 0x20), base_io + 0x3b);

		if (atpdev->chip_ver == 4)

CRA Git | Maintained and supported by SUSTech CRA and CCSE