atp870u: Untangle tmport #7

Untangle the tmport crap so it becomes obvious what ports are accessed.

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:
Ondrej Zary 2015-11-17 19:23:45 +01:00 committed by Martin K. Petersen
parent 493c520193
commit 2eabdf22ad

View File

@ -2716,7 +2716,6 @@ static int atp870u_abort(struct scsi_cmnd * SCpnt)
{ {
unsigned char j, k, c; unsigned char j, k, c;
struct scsi_cmnd *workrequ; struct scsi_cmnd *workrequ;
unsigned int tmport;
struct atp_unit *dev; struct atp_unit *dev;
struct Scsi_Host *host; struct Scsi_Host *host;
host = SCpnt->device->host; host = SCpnt->device->host;
@ -2726,18 +2725,13 @@ static int atp870u_abort(struct scsi_cmnd * SCpnt)
printk(" atp870u: abort Channel = %x \n", c); printk(" atp870u: abort Channel = %x \n", c);
printk("working=%x last_cmd=%x ", dev->working[c], dev->last_cmd[c]); printk("working=%x last_cmd=%x ", dev->working[c], dev->last_cmd[c]);
printk(" quhdu=%x quendu=%x ", dev->quhd[c], dev->quend[c]); printk(" quhdu=%x quendu=%x ", dev->quhd[c], dev->quend[c]);
tmport = dev->ioport[c];
for (j = 0; j < 0x18; j++) { for (j = 0; j < 0x18; j++) {
printk(" r%2x=%2x", j, inb(tmport++)); printk(" r%2x=%2x", j, inb(dev->ioport[c] + j));
} }
tmport += 0x04; printk(" r1c=%2x", inb(dev->ioport[c] + 0x1c));
printk(" r1c=%2x", inb(tmport)); printk(" r1f=%2x in_snd=%2x ", inb(dev->ioport[c] + 0x1f), dev->in_snd[c]);
tmport += 0x03; printk(" d00=%2x", inb(dev->pciport[c]));
printk(" r1f=%2x in_snd=%2x ", inb(tmport), dev->in_snd[c]); printk(" d02=%2x", inb(dev->pciport[c] + 0x02));
tmport= dev->pciport[c];
printk(" d00=%2x", inb(tmport));
tmport += 0x02;
printk(" d02=%2x", inb(tmport));
for(j=0;j<16;j++) { for(j=0;j<16;j++) {
if (dev->id[c][j].curr_req != NULL) { if (dev->id[c][j].curr_req != NULL) {
workrequ = dev->id[c][j].curr_req; workrequ = dev->id[c][j].curr_req;