From aa2a1aaf90a74e6fb81d71ae14c7e6c84049c203 Mon Sep 17 00:00:00 2001
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 10 Oct 2012 18:10:11 +0000
Subject: [PATCH] Remove 'periph == NULL' check from bunch of periph drivers.
 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.

---
 sys/cam/ata/ata_da.c     | 5 -----
 sys/cam/ata/ata_pmp.c    | 5 -----
 sys/cam/ata/ata_xpt.c    | 5 -----
 sys/cam/scsi/scsi_cd.c   | 4 ----
 sys/cam/scsi/scsi_ch.c   | 5 -----
 sys/cam/scsi/scsi_da.c   | 5 -----
 sys/cam/scsi/scsi_pass.c | 5 -----
 sys/cam/scsi/scsi_sa.c   | 5 -----
 sys/cam/scsi/scsi_sg.c   | 5 -----
 sys/cam/scsi/scsi_xpt.c  | 5 -----
 10 files changed, 49 deletions(-)

diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 92ed0c657240..bb63ac89e8e4 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -943,11 +943,6 @@ adaregister(struct cam_periph *periph, void *arg)
 	int legacy_id, quirks;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("adaregister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("adaregister: no getdev CCB, can't register device\n");
 		return(CAM_REQ_CMP_ERR);
diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c
index db671480d76e..b2acdee62920 100644
--- a/sys/cam/ata/ata_pmp.c
+++ b/sys/cam/ata/ata_pmp.c
@@ -367,11 +367,6 @@ pmpregister(struct cam_periph *periph, void *arg)
 	struct ccb_getdev *cgd;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("pmpregister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("pmpregister: no getdev CCB, can't register device\n");
 		return(CAM_REQ_CMP_ERR);
diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index 91f985da23d8..eb1a0b6b429a 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -224,11 +224,6 @@ proberegister(struct cam_periph *periph, void *arg)
 	probe_softc *softc;
 
 	request_ccb = (union ccb *)arg;
-	if (periph == NULL) {
-		printf("proberegister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (request_ccb == NULL) {
 		printf("proberegister: no probe CCB, "
 		       "can't register device\n");
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index def7323009fc..bd42a2803d54 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -692,10 +692,6 @@ cdregister(struct cam_periph *periph, void *arg)
 	caddr_t match;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("cdregister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
 	if (cgd == NULL) {
 		printf("cdregister: no getdev CCB, can't register device\n");
 		return(CAM_REQ_CMP_ERR);
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 11ecb32b5c58..b15abbe4bcc8 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -324,11 +324,6 @@ chregister(struct cam_periph *periph, void *arg)
 	struct ccb_pathinq cpi;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("chregister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("chregister: no getdev CCB, can't register device\n");
 		return(CAM_REQ_CMP_ERR);
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index c434ac32d441..aea2cd39baeb 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1583,11 +1583,6 @@ daregister(struct cam_periph *periph, void *arg)
 	caddr_t match;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("daregister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("daregister: no getdev CCB, can't register device\n");
 		return(CAM_REQ_CMP_ERR);
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index ffb8a80b592c..756fe52c7364 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -312,11 +312,6 @@ passregister(struct cam_periph *periph, void *arg)
 	int    no_tags;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("%s: periph was NULL!!\n", __func__);
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("%s: no getdev CCB, can't register device\n", __func__);
 		return(CAM_REQ_CMP_ERR);
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 45e1d148b43d..6f2d0f740b22 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1445,11 +1445,6 @@ saregister(struct cam_periph *periph, void *arg)
 	int i;
 	
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("saregister: periph was NULL!!\n");
-		return (CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("saregister: no getdev CCB, can't register device\n");
 		return (CAM_REQ_CMP_ERR);
diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c
index e8ccecdbf407..7f64feab0d10 100644
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -261,11 +261,6 @@ sgregister(struct cam_periph *periph, void *arg)
 	int no_tags;
 
 	cgd = (struct ccb_getdev *)arg;
-	if (periph == NULL) {
-		printf("sgregister: periph was NULL!!\n");
-		return (CAM_REQ_CMP_ERR);
-	}
-
 	if (cgd == NULL) {
 		printf("sgregister: no getdev CCB, can't register device\n");
 		return (CAM_REQ_CMP_ERR);
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index dcc76a18e38c..dce4b0c1f0b4 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -615,11 +615,6 @@ proberegister(struct cam_periph *periph, void *arg)
 	probe_softc *softc;
 
 	request_ccb = (union ccb *)arg;
-	if (periph == NULL) {
-		printf("proberegister: periph was NULL!!\n");
-		return(CAM_REQ_CMP_ERR);
-	}
-
 	if (request_ccb == NULL) {
 		printf("proberegister: no probe CCB, "
 		       "can't register device\n");