diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2015-11-17 21:24:04 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2015-11-26 06:08:41 +0300 |
| commit | 95c1def50dd6b1de4ceb0d6950e37e74c301d9d2 (patch) | |
| tree | 58c86baa27170d8857d8f80efe2df36f67478af8 /drivers/scsi/atp870u.c | |
| parent | 460da918d46b075dcc9fdcf77281f8ebde169bd4 (diff) | |
| download | linux-95c1def50dd6b1de4ceb0d6950e37e74c301d9d2.tar.xz | |
atp870u: Move 870-specific code out of is870()
Move few remaining 870-specific code lines out of is870()
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index d76d3869a06d..6427f8737b7d 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c @@ -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) |