From 8e448c38b1a6bbba2ef4fa41a4e9f458fcb946a2 Mon Sep 17 00:00:00 2001 From: Scott Long Date: Fri, 12 Jul 2013 23:20:11 +0000 Subject: [PATCH] Const-ify the new da_delete_functions. Remove a redundant sanity check Submitted by: Steven Hartland Obtained from: Netflix MFC after: 3 days --- sys/cam/scsi/scsi_da.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 37b8356590c..a2b802cc669 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -150,7 +150,7 @@ static da_delete_func_t da_delete_trim; static da_delete_func_t da_delete_unmap; static da_delete_func_t da_delete_ws; -static void * da_delete_functions[] = { +static const void * da_delete_functions[] = { NULL, NULL, da_delete_trim, @@ -1818,10 +1818,7 @@ dadeletemethodset(struct da_softc *softc, da_delete_methods delete_method) softc->delete_method = delete_method; softc->disk->d_delmaxsize = dadeletemaxsize(softc, delete_method); - if (delete_method <= DA_DELETE_MAX) - softc->delete_func = da_delete_functions[delete_method]; - else - softc->delete_func = NULL; + softc->delete_func = da_delete_functions[delete_method]; if (softc->delete_method > DA_DELETE_DISABLE) softc->disk->d_flags |= DISKFLAG_CANDELETE;