diff options
| author | christos <christos@NetBSD.org> | 2006-09-03 05:10:24 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2006-09-03 05:10:24 +0000 |
| commit | 26733bed2e76fa179fe5bcd299d25939629b3c58 (patch) | |
| tree | 2685bc1c1a98f14351372c48e75114dec2547b94 /sys/dev | |
| parent | 44dddc087f0af3c8752287d17df1bfaa5b0c1928 (diff) | |
- comment out impossible comparisons
- remove superfluous if statement
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/rtw.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 94582632eae..726b9e3a99d 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtw.c,v 1.75 2006/08/31 19:24:38 dyoung Exp $ */ +/* $NetBSD: rtw.c,v 1.76 2006/09/03 05:10:24 christos Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.75 2006/08/31 19:24:38 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.76 2006/09/03 05:10:24 christos Exp $"); #include "bpfilter.h" @@ -410,9 +410,10 @@ rtw_access_string(enum rtw_access access) static void rtw_set_access1(struct rtw_regs *regs, enum rtw_access naccess) { - KASSERT(naccess >= RTW_ACCESS_NONE && naccess <= RTW_ACCESS_ANAPARM); - KASSERT(regs->r_access >= RTW_ACCESS_NONE && - regs->r_access <= RTW_ACCESS_ANAPARM); + KASSERT(/* naccess >= RTW_ACCESS_NONE && */ + naccess <= RTW_ACCESS_ANAPARM); + KASSERT(/* regs->r_access >= RTW_ACCESS_NONE && */ + regs->r_access <= RTW_ACCESS_ANAPARM); if (naccess == regs->r_access) return; @@ -753,8 +754,7 @@ rtw_reset(struct rtw_softc *sc) if ((rc = rtw_chip_reset(&sc->sc_regs, sc->sc_dev.dv_xname)) != 0) return rc; - if ((rc = rtw_recall_eeprom(&sc->sc_regs, sc->sc_dev.dv_xname)) != 0) - ; + rc = rtw_recall_eeprom(&sc->sc_regs, sc->sc_dev.dv_xname); config1 = RTW_READ8(&sc->sc_regs, RTW_CONFIG1); RTW_WRITE8(&sc->sc_regs, RTW_CONFIG1, config1 & ~RTW_CONFIG1_PMEN); |
