[Midnightbsd-cvs] src [9478] trunk/sys/cam/scsi/scsi_da.c: Removed unneeded tests in dadeletemethodset

[laffer1 at midnightbsd.org]

Revision: 9478
          http://svnweb.midnightbsd.org/src/?rev=9478
Author:   laffer1
Date:     2017-03-05 14:59:43 -0500 (Sun, 05 Mar 2017)
Log Message:
-----------
Removed unneeded tests in dadeletemethodset

Modified Paths:
--------------
    trunk/sys/cam/scsi/scsi_da.c

Modified: trunk/sys/cam/scsi/scsi_da.c
===================================================================
--- trunk/sys/cam/scsi/scsi_da.c	2017-03-05 19:59:16 UTC (rev 9477)
+++ trunk/sys/cam/scsi/scsi_da.c	2017-03-05 19:59:43 UTC (rev 9478)
@@ -868,7 +868,7 @@
 static	void		dasysctlinit(void *context, int pending);
 static	int		dacmdsizesysctl(SYSCTL_HANDLER_ARGS);
 static	int		dadeletemethodsysctl(SYSCTL_HANDLER_ARGS);
-static	int		dadeletemethodset(struct da_softc *softc,
+static	void		dadeletemethodset(struct da_softc *softc,
 					  da_delete_methods delete_method);
 static	periph_ctor_t	daregister;
 static	periph_dtor_t	dacleanup;
@@ -1568,12 +1568,10 @@
 	return (0);
 }
 
-static int
+static void
 dadeletemethodset(struct da_softc *softc, da_delete_methods delete_method)
 {
 
-	if (delete_method < 0 || delete_method > DA_DELETE_MAX)
-		return (EINVAL);
 
 	softc->delete_method = delete_method;
 
@@ -1581,8 +1579,6 @@
 		softc->disk->d_flags |= DISKFLAG_CANDELETE;
 	else
 		softc->disk->d_flags &= ~DISKFLAG_CANDELETE;
-
-	return (0);
 }
 
 static int
@@ -1607,7 +1603,8 @@
 	for (i = 0; i <= DA_DELETE_MAX; i++) {
 		if (strcmp(buf, da_delete_method_names[i]) != 0)
 			continue;
-		return dadeletemethodset(softc, i);
+		dadeletemethodset(softc, i);
+		return (0);
 	}
 	return (EINVAL);
 }