p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

atp870u: Remove ugly gotos #4 

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:52 +01:00 committed by Martin K. Petersen
parent 832e9ac6de
commit 58c4d046b4
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/scsi/atp870u.c
View File

@ -970,19 +970,19 @@ static void tscam(struct Scsi_Host *host)
} else {
outb(0x00, dev->ioport[0] + 0x1b);
}
wait_rdyok:
outb(0x09, dev->ioport[0] + 0x18);
do {
outb(0x09, dev->ioport[0] + 0x18);
while ((inb(dev->ioport[0] + 0x1f) & 0x80) == 0x00)
cpu_relax();
k = inb(dev->ioport[0] + 0x17);
if (k != 0x16) {
if ((k == 0x85) || (k == 0x42)) {
continue;
}
outb(0x41, dev->ioport[0] + 0x10);
goto wait_rdyok;
}
while ((inb(dev->ioport[0] + 0x1f) & 0x80) == 0x00)
cpu_relax();
k = inb(dev->ioport[0] + 0x17);
if ((k == 0x85) || (k == 0x42))
break;
if (k != 0x16)
outb(0x41, dev->ioport[0] + 0x10);
} while (k != 0x16);
if ((k == 0x85) || (k == 0x42))
continue;
assignid_map |= m;
}
@ -1003,10 +1003,8 @@ static void tscam(struct Scsi_Host *host)
mdelay(128);
val &= 0x00fb; /* after 1ms no msg */
outw(val, dev->ioport[0] + 0x1c);
wait_nomsg:
if ((inb(dev->ioport[0] + 0x1c) & 0x04) != 0) {
goto wait_nomsg;
}
while ((inb(dev->ioport[0] + 0x1c) & 0x04) != 0)
;
outb(1, 0x80);
udelay(100);
for (n = 0; n < 0x30000; n++) {