svn commit: r251305 - stable/9/sys/cam/scsi

[Steven Hartland]

Author: smh
Date: Mon Jun  3 16:14:24 2013
New Revision: 251305
URL: http://svnweb.freebsd.org/changeset/base/251305

Log:
  MFC r249929:
  Removed unneeded tests in dadeletemethodset

Modified:
  stable/9/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_da.c	Mon Jun  3 16:10:30 2013	(r251304)
+++ stable/9/sys/cam/scsi/scsi_da.c	Mon Jun  3 16:14:24 2013	(r251305)
@@ -868,7 +868,7 @@ static	void		daasync(void *callback_arg,
 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 @@ dacmdsizesysctl(SYSCTL_HANDLER_ARGS)
 	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 @@ dadeletemethodset(struct da_softc *softc
 		softc->disk->d_flags |= DISKFLAG_CANDELETE;
 	else
 		softc->disk->d_flags &= ~DISKFLAG_CANDELETE;
-
-	return (0);
 }
 
 static int
@@ -1607,7 +1603,8 @@ dadeletemethodsysctl(SYSCTL_HANDLER_ARGS
 	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);
 }