summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2012-10-23 16:03:00 +0000
committermav <mav@FreeBSD.org>2012-10-23 16:03:00 +0000
commita8f86acc0967fe6e17b37269a656dea02c4a2513 (patch)
treee6f4c189c836b7773f5453fb080ca011d1490b95
parent7a361f808b8fe4450c074672604f841d96d15678 (diff)
downloadFreeBSD-src-a8f86acc0967fe6e17b37269a656dea02c4a2513.zip
FreeBSD-src-a8f86acc0967fe6e17b37269a656dea02c4a2513.tar.gz
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.
-rw-r--r--sys/cam/scsi/scsi_enc.c5
-rw-r--r--sys/cam/scsi/scsi_pt.c5
2 files changed, 0 insertions, 10 deletions
diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c
index f8769de..f5601dd 100644
--- a/sys/cam/scsi/scsi_enc.c
+++ b/sys/cam/scsi/scsi_enc.c
@@ -879,11 +879,6 @@ enc_ctor(struct cam_periph *periph, void *arg)
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;
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 26f4d19..826afb3 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -255,11 +255,6 @@ ptctor(struct cam_periph *periph, void *arg)
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);
OpenPOWER on IntegriCloud