From owner-svn-src-head@FreeBSD.ORG  Tue Oct 23 16:03:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9DC30E17;
 Tue, 23 Oct 2012 16:03:00 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 863218FC0A;
 Tue, 23 Oct 2012 16:03:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9NG302Y004955;
 Tue, 23 Oct 2012 16:03:00 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9NG30DL004951;
 Tue, 23 Oct 2012 16:03:00 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201210231603.q9NG30DL004951@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 23 Oct 2012 16:03:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241952 - head/sys/cam/scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Oct 2012 16:03:00 -0000

Author: mav
Date: Tue Oct 23 16:03:00 2012
New Revision: 241952
URL: http://svn.freebsd.org/changeset/base/241952

Log:
  Remove two more 'periph == NULL' checks missed in r241404.
  This condition can never be true as functions are called from single place
  and the checks just pollute the code and confuse Clang Static Analyzer.

Modified:
  head/sys/cam/scsi/scsi_enc.c
  head/sys/cam/scsi/scsi_pt.c

Modified: head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc.c	Tue Oct 23 15:48:42 2012	(r241951)
+++ head/sys/cam/scsi/scsi_enc.c	Tue Oct 23 16:03:00 2012	(r241952)
@@ -879,11 +879,6 @@ enc_ctor(struct cam_periph *periph, void
 	char *tname;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("enc_ctor: periph was NULL!!\n");
-		goto out;
-	}
-
 	if (cgd == NULL) {
 		printf("enc_ctor: no getdev CCB, can't register device\n");
 		goto out;

Modified: head/sys/cam/scsi/scsi_pt.c
==============================================================================
--- head/sys/cam/scsi/scsi_pt.c	Tue Oct 23 15:48:42 2012	(r241951)
+++ head/sys/cam/scsi/scsi_pt.c	Tue Oct 23 16:03:00 2012	(r241952)
@@ -255,11 +255,6 @@ ptctor(struct cam_periph *periph, void *
 	struct ccb_pathinq cpi;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("ptregister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("ptregister: no getdev CCB, can't register device\n");
 		return(CAM_REQ_CMP_ERR);