diff options
| author | scottl <scottl@FreeBSD.org> | 2013-07-12 23:20:11 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2013-07-12 23:20:11 +0000 |
| commit | bfbf95a9a25ffe82c3ee1ca6f2c6ffaf70edd43d (patch) | |
| tree | 2e327c1a3cbe31741a8785495b9e4ba79098e74f /sys/cam | |
| parent | b209295808d6a16951dc58b69c3705f851994512 (diff) | |
| download | FreeBSD-src-bfbf95a9a25ffe82c3ee1ca6f2c6ffaf70edd43d.zip FreeBSD-src-bfbf95a9a25ffe82c3ee1ca6f2c6ffaf70edd43d.tar.gz | |
Const-ify the new da_delete_functions.
Remove a redundant sanity check
Submitted by: Steven Hartland
Obtained from: Netflix
MFC after: 3 days
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 37b8356..a2b802c 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; |
