[Midnightbsd-cvs] src [8241] trunk/sys/cam: remove null checks from periph drivers.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 17 17:31:43 EDT 2016


Revision: 8241
          http://svnweb.midnightbsd.org/src/?rev=8241
Author:   laffer1
Date:     2016-09-17 17:31:43 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
remove null checks from periph drivers.

Modified Paths:
--------------
    trunk/sys/cam/ata/ata_da.c
    trunk/sys/cam/ata/ata_pmp.c
    trunk/sys/cam/ata/ata_xpt.c
    trunk/sys/cam/scsi/scsi_cd.c
    trunk/sys/cam/scsi/scsi_ch.c
    trunk/sys/cam/scsi/scsi_da.c
    trunk/sys/cam/scsi/scsi_pass.c
    trunk/sys/cam/scsi/scsi_sa.c
    trunk/sys/cam/scsi/scsi_sg.c
    trunk/sys/cam/scsi/scsi_xpt.c

Modified: trunk/sys/cam/ata/ata_da.c
===================================================================
--- trunk/sys/cam/ata/ata_da.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/ata/ata_da.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -1199,11 +1199,6 @@
 	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);

Modified: trunk/sys/cam/ata/ata_pmp.c
===================================================================
--- trunk/sys/cam/ata/ata_pmp.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/ata/ata_pmp.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -367,11 +367,6 @@
 	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);

Modified: trunk/sys/cam/ata/ata_xpt.c
===================================================================
--- trunk/sys/cam/ata/ata_xpt.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/ata/ata_xpt.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -224,11 +224,6 @@
 	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");

Modified: trunk/sys/cam/scsi/scsi_cd.c
===================================================================
--- trunk/sys/cam/scsi/scsi_cd.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/scsi/scsi_cd.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -641,10 +641,6 @@
 	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);

Modified: trunk/sys/cam/scsi/scsi_ch.c
===================================================================
--- trunk/sys/cam/scsi/scsi_ch.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/scsi/scsi_ch.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -324,11 +324,6 @@
 	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);

Modified: trunk/sys/cam/scsi/scsi_da.c
===================================================================
--- trunk/sys/cam/scsi/scsi_da.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/scsi/scsi_da.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -1550,11 +1550,6 @@
 	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);

Modified: trunk/sys/cam/scsi/scsi_pass.c
===================================================================
--- trunk/sys/cam/scsi/scsi_pass.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/scsi/scsi_pass.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -312,11 +312,6 @@
 	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);

Modified: trunk/sys/cam/scsi/scsi_sa.c
===================================================================
--- trunk/sys/cam/scsi/scsi_sa.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/scsi/scsi_sa.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -1445,11 +1445,6 @@
 	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);

Modified: trunk/sys/cam/scsi/scsi_sg.c
===================================================================
--- trunk/sys/cam/scsi/scsi_sg.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/scsi/scsi_sg.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -261,11 +261,6 @@
 	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);

Modified: trunk/sys/cam/scsi/scsi_xpt.c
===================================================================
--- trunk/sys/cam/scsi/scsi_xpt.c	2016-09-17 21:31:18 UTC (rev 8240)
+++ trunk/sys/cam/scsi/scsi_xpt.c	2016-09-17 21:31:43 UTC (rev 8241)
@@ -615,11 +615,6 @@
 	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");



More information about the Midnightbsd-cvs mailing list