diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2010-08-12 16:59:30 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2010-08-12 16:59:30 +0000 |
| commit | 936cbc0552da6fd0013242f8cb91ef9337d2459d (patch) | |
| tree | 469570857a2d7aaa1ff0a91b49ea40be791c51f2 /sys | |
| parent | de5938e60019448c40f039ca3daea63ef52f05ef (diff) | |
homogeneous style.
no binary change.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_ipw.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index e2d28eab276..b2407f5b57b 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.89 2010/08/12 15:03:59 oga Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.90 2010/08/12 16:59:29 damien Exp $ */ /*- * Copyright (c) 2004-2008 @@ -311,7 +311,7 @@ ipw_activate(struct device *self, int act) break; } - return (0); + return 0; } void @@ -1402,9 +1402,9 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * Prevent processes from entering this function while another * process is tsleep'ing in it. */ - while (sc->sc_flags & IPW_FLAG_BUSY && error == 0) + while ((sc->sc_flags & IPW_FLAG_BUSY) && error == 0) error = tsleep(&sc->sc_flags, PCATCH, "ipwioc", 0); - if (error) { + if (error != 0) { splx(s); return error; } diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index c6b770452e9..9dc4517fe6e 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.106 2010/08/12 15:03:59 oga Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.107 2010/08/12 16:59:29 damien Exp $ */ /*- * Copyright (c) 2004-2008 @@ -353,7 +353,7 @@ iwi_activate(struct device *self, int act) break; } - return (0); + return 0; } void @@ -1489,9 +1489,9 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * Prevent processes from entering this function while another * process is tsleep'ing in it. */ - while (sc->sc_flags & IWI_FLAG_BUSY && error == 0) + while ((sc->sc_flags & IWI_FLAG_BUSY) && error == 0) error = tsleep(&sc->sc_flags, PCATCH, "iwiioc", 0); - if (error) { + if (error != 0) { splx(s); return error; } diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 29b11456b29..3c0b0df7bce 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.101 2010/08/12 15:04:00 oga Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.102 2010/08/12 16:59:29 damien Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -758,7 +758,7 @@ iwn_activate(struct device *self, int act) break; } - return (0); + return 0; } void @@ -3114,9 +3114,9 @@ iwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * Prevent processes from entering this function while another * process is tsleep'ing in it. */ - while (sc->sc_flags & IWN_FLAG_BUSY && error == 0) + while ((sc->sc_flags & IWN_FLAG_BUSY) && error == 0) error = tsleep(&sc->sc_flags, PCATCH, "iwnioc", 0); - if (error) { + if (error != 0) { splx(s); return error; } diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 5ca6aa11cba..6458e6bbe61 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.105 2010/08/12 15:04:00 oga Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.106 2010/08/12 16:59:29 damien Exp $ */ /*- * Copyright (c) 2006-2008 @@ -408,7 +408,7 @@ wpi_activate(struct device *self, int act) break; } - return (0); + return 0; } void @@ -2002,9 +2002,9 @@ wpi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * Prevent processes from entering this function while another * process is tsleep'ing in it. */ - while (sc->sc_flags & WPI_FLAG_BUSY && error == 0) + while ((sc->sc_flags & WPI_FLAG_BUSY) && error == 0) error = tsleep(&sc->sc_flags, PCATCH, "wpiioc", 0); - if (error) { + if (error != 0) { splx(s); return error; } |