d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wpi_intr(): remove duplicate code

Browse Source 
PR:		kern/197143
Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>
This commit is contained in:
Adrian Chadd 2015-03-15 20:30:03 +00:00
parent 8e4cf38ac7
commit 7f1299c5cd
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/wpi/if_wpi.c
View File

@ -2195,10 +2195,8 @@ wpi_intr(void *arg)
r1 = WPI_READ(sc, WPI_INT); r1 = WPI_READ(sc, WPI_INT);
if (r1 == 0xffffffff || (r1 & 0xfffffff0) == 0xa5a5a5a0) { if (r1 == 0xffffffff || (r1 & 0xfffffff0) == 0xa5a5a5a0)
WPI_UNLOCK(sc); goto end; /* Hardware gone! */
return; /* Hardware gone! */
}
r2 = WPI_READ(sc, WPI_FH_INT); r2 = WPI_READ(sc, WPI_FH_INT);
@ -2222,8 +2220,7 @@ wpi_intr(void *arg)
"(Hardware Error)"); "(Hardware Error)");
ieee80211_runtask(ic, &sc->sc_reinittask); ieee80211_runtask(ic, &sc->sc_reinittask);
sc->flags &= ~WPI_FLAG_BUSY; sc->flags &= ~WPI_FLAG_BUSY;
WPI_UNLOCK(sc); goto end;
return;
} }
if ((r1 & (WPI_INT_FH_RX | WPI_INT_SW_RX)) || if ((r1 & (WPI_INT_FH_RX | WPI_INT_SW_RX)) ||
@ -2241,7 +2238,7 @@ done:
if (ifp->if_flags & IFF_UP) if (ifp->if_flags & IFF_UP)
WPI_WRITE(sc, WPI_INT_MASK, WPI_INT_MASK_DEF); WPI_WRITE(sc, WPI_INT_MASK, WPI_INT_MASK_DEF);
WPI_UNLOCK(sc); end: WPI_UNLOCK(sc);
} }
static int static int