diff options
author | phk <phk@FreeBSD.org> | 2009-09-08 13:19:05 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2009-09-08 13:19:05 +0000 |
commit | 52972616516a18e69bb2849c2f2e718ee644b27f (patch) | |
tree | 9f7c1709b6ce492cd874120e81e8a117cab4ca7d /sys/dev/ep | |
parent | 2314521104388ada19392a3b2cdaca4ba6f82243 (diff) | |
download | FreeBSD-src-52972616516a18e69bb2849c2f2e718ee644b27f.zip FreeBSD-src-52972616516a18e69bb2849c2f2e718ee644b27f.tar.gz |
Revert previous commit and add myself to the list of people who should
know better than to commit with a cat in the area.
Diffstat (limited to 'sys/dev/ep')
-rw-r--r-- | sys/dev/ep/if_ep.c | 1 | ||||
-rw-r--r-- | sys/dev/ep/if_epreg.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index 0a7e808..f5fd475 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -666,7 +666,6 @@ rescan: sc->tx_underrun++; #endif } else { - /* XXX: FlexeLint doesn't like ; */ if (status & TXS_JABBER); else ++ifp->if_collisions; diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h index 8c46403..f3c269f 100644 --- a/sys/dev/ep/if_epreg.h +++ b/sys/dev/ep/if_epreg.h @@ -315,11 +315,7 @@ S_TX_AVAIL|S_RX_COMPLETE|S_RX_EARLY) #define S_COMMAND_IN_PROGRESS (u_short) (0x1000) -#define EP_BUSY_WAIT(sc) \ - do { \ - while (CSR_READ_2(sc, EP_STATUS) & S_COMMAND_IN_PROGRESS) \ - continue; \ - } while (0) +#define EP_BUSY_WAIT(sc) while (CSR_READ_2(sc, EP_STATUS) & S_COMMAND_IN_PROGRESS) /* Address Config. Register. * Window 0/Port 06 |