From owner-svn-src-all@FreeBSD.ORG  Tue Jan 18 15:23:16 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E81CA10656A4;
	Tue, 18 Jan 2011 15:23:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D76B88FC26;
	Tue, 18 Jan 2011 15:23:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IFNGSt042082;
	Tue, 18 Jan 2011 15:23:16 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IFNGeB042079;
	Tue, 18 Jan 2011 15:23:16 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201101181523.p0IFNGeB042079@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 18 Jan 2011 15:23:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217538 - in head/sys/dev: buslogic cs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jan 2011 15:23:17 -0000

Author: jhb
Date: Tue Jan 18 15:23:16 2011
New Revision: 217538
URL: http://svn.freebsd.org/changeset/base/217538

Log:
  Remove some always-true comparisons.
  
  Submitted by:	clang via rdivacky

Modified:
  head/sys/dev/buslogic/bt.c
  head/sys/dev/cs/if_cs.c

Modified: head/sys/dev/buslogic/bt.c
==============================================================================
--- head/sys/dev/buslogic/bt.c	Tue Jan 18 14:58:44 2011	(r217537)
+++ head/sys/dev/buslogic/bt.c	Tue Jan 18 15:23:16 2011	(r217538)
@@ -975,7 +975,7 @@ bt_find_probe_range(int ioport, int *por
 int
 bt_iop_from_bio(isa_compat_io_t bio_index)
 {
-	if (bio_index >= 0 && bio_index < BT_NUM_ISAPORTS)
+	if (bio_index < BT_NUM_ISAPORTS)
 		return (bt_board_ports[bio_index]);
 	return (-1);
 }

Modified: head/sys/dev/cs/if_cs.c
==============================================================================
--- head/sys/dev/cs/if_cs.c	Tue Jan 18 14:58:44 2011	(r217537)
+++ head/sys/dev/cs/if_cs.c	Tue Jan 18 15:23:16 2011	(r217538)
@@ -364,7 +364,7 @@ cs_cs89x0_probe(device_t dev)
 
 	if (!error && !(sc->flags & CS_NO_IRQ)) {
 		if (chip_type == CS8900) {
-			if (irq >= 0 || irq < 16)
+			if (irq < 16)
 				irq = cs8900_irq2eeint[irq];
 			else
 				irq = 255;