Eliminate bogus seatbelt in wi_cmd. This may have been appropriate

for the spl-era locking, but now that we can have multiple, concurrent
interrupts for multiple wi devices, having a global check to make sure
at most one of them was in wi_cmd no longer makes sense.

MFC After: 2 decifortnight
This commit is contained in:
imp 2005-08-29 15:46:41 +00:00
parent 418b31b495
commit f20f47a7ba

View File

@ -2431,15 +2431,10 @@ static int
wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2) wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2)
{ {
int i, s = 0; int i, s = 0;
static volatile int count = 0;
if (sc->wi_gone) if (sc->wi_gone)
return (ENODEV); return (ENODEV);
if (count > 0)
panic("Hey partner, hold on there!");
count++;
/* wait for the busy bit to clear */ /* wait for the busy bit to clear */
for (i = sc->wi_cmd_count; i > 0; i--) { /* 500ms */ for (i = sc->wi_cmd_count; i > 0; i--) { /* 500ms */
if (!(CSR_READ_2(sc, WI_COMMAND) & WI_CMD_BUSY)) if (!(CSR_READ_2(sc, WI_COMMAND) & WI_CMD_BUSY))