Module Name: src
Committed By: joerg
Date: Thu Aug 14 16:55:02 UTC 2014
Modified Files:
src/sys/arch/arm/xscale: ixp425_npe.c
Log Message:
Remove tautologies.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/ixp425_npe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xscale/ixp425_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_npe.c:1.10 src/sys/arch/arm/xscale/ixp425_npe.c:1.11
--- src/sys/arch/arm/xscale/ixp425_npe.c:1.10 Thu Mar 20 06:48:54 2014
+++ src/sys/arch/arm/xscale/ixp425_npe.c Thu Aug 14 16:55:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_npe.c,v 1.10 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: ixp425_npe.c,v 1.11 2014/08/14 16:55:02 joerg Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler, Errno Consulting
@@ -62,7 +62,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.10 2014/03/20 06:48:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.11 2014/08/14 16:55:02 joerg Exp $");
/*
* Intel XScale Network Processing Engine (NPE) support.
@@ -594,13 +594,13 @@ npe_load_stateinfo(struct ixpnpe_softc *
IX_NPEDL_OFFSET_STATE_ADDR_CTXT_NUM;
/* error-check Context Register No. and Context Number values */
- if (!(0 <= reg && reg < IX_NPEDL_CTXT_REG_MAX)) {
+ if (reg >= IX_NPEDL_CTXT_REG_MAX) {
printf("%s: invalid Context Register %u\n", device_xname(sc->sc_dev),
reg);
error = EINVAL;
break;
}
- if (!(0 <= cNum && cNum < IX_NPEDL_CTXT_NUM_MAX)) {
+ if (cNum >= IX_NPEDL_CTXT_NUM_MAX) {
printf("%s: invalid Context Number %u\n", device_xname(sc->sc_dev),
cNum);
error = EINVAL;