mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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>
This commit is contained in:
parent
460da918d4
commit
95c1def50d
1 changed files with 2 additions and 3 deletions
|
@ -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 @@ static void is870(struct atp_unit *dev, unsigned char c, bool wide_chip)
|
|||
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 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue