scsi: make sure all drivers set the use_clustering flag

A few drivers were not setting the use_clustering flag at all and thus
default to disable.  Fix them up to explicitly set this field in
preparation for additional cleanups.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

6 files changed, 6 insertions, 0 deletions

diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 3d2d026d1ccf..d0c3f867fc58 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -2197,6 +2197,7 @@ static struct scsi_host_template mvumi_template = {
         .eh_timed_out = mvumi_timed_out,
         .eh_host_reset_handler = mvumi_host_reset,
         .bios_param = mvumi_bios_param,
+        .use_clustering = DISABLE_CLUSTERING,
         .this_id = -1,
 };
 
diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
index aeb282f617c5..f1abe38e3b3a 100644
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -2236,6 +2236,7 @@ struct scsi_host_template myrb_template = {
         .shost_attrs            = myrb_shost_attrs,
         .sdev_attrs             = myrb_sdev_attrs,
         .this_id                = -1,
+        .use_clustering         = DISABLE_CLUSTERING,
 };
 
 /**
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index 0264a2e2bc19..f47b36382afa 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -1929,6 +1929,7 @@ struct scsi_host_template myrs_template = {
         .shost_attrs            = myrs_shost_attrs,
         .sdev_attrs             = myrs_sdev_attrs,
         .this_id                = -1,
+        .use_clustering         = DISABLE_CLUSTERING,
 };
 
 static struct myrs_hba *myrs_alloc_host(struct pci_dev *pdev,
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 95f370ad05e0..af9078320d4b 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1489,6 +1489,7 @@ static struct scsi_host_template driver_template = {
         .eh_abort_handler               = stex_abort,
         .eh_host_reset_handler          = stex_reset,
         .this_id                        = -1,
+        .use_clustering                 = DISABLE_CLUSTERING,
 };
 
 static struct pci_device_id stex_pci_tbl[] = {
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 751027d73cf3..e5800da0053d 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -6982,6 +6982,7 @@ static struct scsi_host_template ufshcd_driver_template = {
         .max_host_blocked       = 1,
         .track_queue_depth      = 1,
         .sdev_groups            = ufshcd_driver_groups,
+        .use_clustering         = DISABLE_CLUSTERING,
 };
 
 static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg,
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 1f7b401c4d04..6c75a0a50b3a 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -879,6 +879,7 @@ static struct scsi_host_template uas_host_template = {
         .this_id = -1,
         .sg_tablesize = SG_NONE,
         .skip_settle_delay = 1,
+        .use_clustering = DISABLE_CLUSTERING,
 };
 
 #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \