From fb2cec6f530b54648dac4e92aa85a645e3c33eea Mon Sep 17 00:00:00 2001 From: Scott Long Date: Thu, 20 Apr 2017 20:46:34 +0000 Subject: [PATCH] Reorder the minimum_cmd_size code to make it a little smaller and easier to read. --- sys/cam/scsi/scsi_da.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 2110ee0c131..4a6f5e362d8 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2500,17 +2500,15 @@ daregister(struct cam_periph *periph, void *arg) /* * 6, 10, 12 and 16 are the currently permissible values. */ - if (softc->minimum_cmd_size < 6) - softc->minimum_cmd_size = 6; - else if ((softc->minimum_cmd_size > 6) - && (softc->minimum_cmd_size <= 10)) - softc->minimum_cmd_size = 10; - else if ((softc->minimum_cmd_size > 10) - && (softc->minimum_cmd_size <= 12)) - softc->minimum_cmd_size = 12; - else if (softc->minimum_cmd_size > 12) + if (softc->minimum_cmd_size > 12) softc->minimum_cmd_size = 16; - + else if (softc->minimum_cmd_size > 10) + softc->minimum_cmd_size = 12; + else if (softc->minimum_cmd_size > 6) + softc->minimum_cmd_size = 10; + else + softc->minimum_cmd_size = 6; + /* Predict whether device may support READ CAPACITY(16). */ if (SID_ANSI_REV(&cgd->inq_data) >= SCSI_REV_SPC3 && (softc->quirks & DA_Q_NO_RC16) == 0) {