37 files changed, 34 insertions, 53 deletions

diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index 177c031763c0..c1dd4939f4ae 100644
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
@@ -1098,8 +1098,6 @@ of interest:
     unchecked_isa_dma - 1=>only use bottom 16 MB of ram (ISA DMA addressing
                    restriction), 0=>can use full 32 bit (or better) DMA
                    address space
-    use_clustering - 1=>SCSI commands in mid level's queue can be merged,
-                     0=>disallow SCSI command merging
     no_async_abort - 1=>Asynchronous aborts are not supported
                      0=>Timed-out commands will be aborted asynchronously
     hostt        - pointer to driver's struct scsi_host_template from which
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 7e1426e76d96..f86844fc0725 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -347,7 +347,7 @@ static struct scsi_host_template driver_template = {
         .sg_tablesize           = SG_ALL,
         .max_sectors            = 1024,
         .cmd_per_lun            = SIMSCSI_REQ_QUEUE_LEN,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static int __init
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 61aadc7acb49..c96bc7261a42 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -160,7 +160,7 @@ static struct scsi_host_template a2091_scsi_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = CMD_PER_LUN,
-        .use_clustering         = DISABLE_CLUSTERING
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static int a2091_probe(struct zorro_dev *z, const struct zorro_device_id *ent)
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 95b4793c33f4..d37584403c33 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -3192,8 +3192,8 @@ static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost)
                    shost->sg_tablesize, shost->cmd_per_lun);
 
         seq_printf(m,
-                   " unchecked_isa_dma %d, use_clustering %d\n",
-                   shost->unchecked_isa_dma, shost->use_clustering);
+                   " unchecked_isa_dma %d\n",
+                   shost->unchecked_isa_dma);
 
         seq_printf(m,
                    " flags 0x%x, last_reset 0x%lx, jiffies 0x%lx, asc_n_io_port 0x%x\n",
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 301b3cad15f8..97872838b983 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -2920,7 +2920,7 @@ static struct scsi_host_template aha152x_driver_template = {
         .can_queue                      = 1,
         .this_id                        = 7,
         .sg_tablesize                   = SG_ALL,
-        .use_clustering                 = DISABLE_CLUSTERING,
+        .dma_boundary                   = PAGE_SIZE - 1,
         .slave_alloc                    = aha152x_adjust_queue,
 };
 
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 421fe869a11e..d7509859dc00 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -2890,7 +2890,7 @@ static struct scsi_host_template acornscsi_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .proc_name              = "acornscsi",
 };
 
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 3110736fd337..5e9dd9f34821 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -245,7 +245,7 @@ static struct scsi_host_template arxescsi_template = {
         .can_queue                      = 0,
         .this_id                        = 7,
         .sg_tablesize                   = SG_ALL,
-        .use_clustering                 = DISABLE_CLUSTERING,
+        .dma_boundary                   = PAGE_SIZE - 1,
         .proc_name                      = "arxescsi",
 };
 
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index ae1d809904fb..e2d2a81d8e0b 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -221,10 +221,10 @@ static struct scsi_host_template cumanascsi_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
         .proc_name              = "CumanaSCSI-1",
         .cmd_size               = NCR5380_CMD_SIZE,
         .max_sectors            = 128,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static int cumanascsi1_probe(struct expansion_card *ec,
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 05b7f755499b..8f2efaab8d46 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -110,7 +110,7 @@ static struct scsi_host_template oakscsi_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .proc_name              = "oakscsi",
         .cmd_size               = NCR5380_CMD_SIZE,
         .max_sectors            = 128,
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 89f5154c40b6..a503dc50c4f8 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -714,7 +714,7 @@ static struct scsi_host_template atari_scsi_template = {
         .eh_host_reset_handler  = atari_scsi_host_reset,
         .this_id                = 7,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .cmd_size               = NCR5380_CMD_SIZE,
 };
 
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index bf07735275a4..8a20411699d9 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -95,7 +95,7 @@ static struct scsi_host_template cxgb3i_host_template = {
         .eh_device_reset_handler = iscsi_eh_device_reset,
         .eh_target_reset_handler = iscsi_eh_recover_target,
         .target_alloc   = iscsi_target_alloc,
-        .use_clustering = DISABLE_CLUSTERING,
+        .dma_boundary   = PAGE_SIZE - 1,
         .this_id        = -1,
         .track_queue_depth = 1,
 };
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 064ef5735182..762337de1116 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -113,7 +113,7 @@ static struct scsi_host_template cxgb4i_host_template = {
         .eh_device_reset_handler = iscsi_eh_device_reset,
         .eh_target_reset_handler = iscsi_eh_recover_target,
         .target_alloc   = iscsi_target_alloc,
-        .use_clustering = DISABLE_CLUSTERING,
+        .dma_boundary   = PAGE_SIZE - 1,
         .this_id        = -1,
         .track_queue_depth = 1,
 };
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index 8c55ec6e1827..13fbb2eab842 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -4631,7 +4631,7 @@ static struct scsi_host_template dc395x_driver_template = {
         .cmd_per_lun            = DC395x_MAX_CMD_PER_LUN,
         .eh_abort_handler       = dc395x_eh_abort,
         .eh_bus_reset_handler   = dc395x_eh_bus_reset,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 003c3d726238..8db1cc552932 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -63,7 +63,7 @@ static struct scsi_host_template dmx3191d_driver_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .cmd_size               = NCR5380_CMD_SIZE,
 };
 
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index fc538181f8df..9cdca0625498 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -700,7 +700,7 @@ static struct scsi_host_template driver_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .cmd_size               = NCR5380_CMD_SIZE,
         .max_sectors            = 128,
 };
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index a27fc49ebd3a..d2acd0d826e2 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -184,7 +184,7 @@ static struct scsi_host_template gvp11_scsi_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = CMD_PER_LUN,
-        .use_clustering         = DISABLE_CLUSTERING
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static int check_wd33c93(struct gvp11_scsiregs *regs)
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index e8148ba414a3..fce0b5d7119e 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -431,7 +431,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         shost->sg_prot_tablesize = sht->sg_prot_tablesize;
         shost->cmd_per_lun = sht->cmd_per_lun;
         shost->unchecked_isa_dma = sht->unchecked_isa_dma;
-        shost->use_clustering = sht->use_clustering;
         shost->no_write_same = sht->no_write_same;
 
         if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 067725295083..e8bc8d328bab 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -6677,7 +6677,6 @@ ips_register_scsi(int index)
         sh->sg_tablesize = sh->hostt->sg_tablesize;
         sh->can_queue = sh->hostt->can_queue;
         sh->cmd_per_lun = sh->hostt->cmd_per_lun;
-        sh->use_clustering = sh->hostt->use_clustering;
         sh->max_sectors = 128;
 
         sh->max_id = ha->ntargets;
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 23354f206533..0175684a14dc 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -980,7 +980,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = {
         .eh_abort_handler       = iscsi_eh_abort,
         .eh_device_reset_handler= iscsi_eh_device_reset,
         .eh_target_reset_handler = iscsi_eh_recover_target,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .slave_alloc            = iscsi_sw_tcp_slave_alloc,
         .slave_configure        = iscsi_sw_tcp_slave_configure,
         .target_alloc           = iscsi_target_alloc,
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 764d320bb2ca..ee741207fd4e 100644
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -307,7 +307,7 @@ static int esp_mac_probe(struct platform_device *dev)
                 goto fail;
 
         host->max_id = 8;
-        host->use_clustering = DISABLE_CLUSTERING;
+        host->dma_boundary = PAGE_SIZE - 1;
         esp = shost_priv(host);
 
         esp->host = host;
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index dd6057359d7c..8b4b5b1a13d7 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -333,7 +333,7 @@ static struct scsi_host_template mac_scsi_template = {
         .this_id                = 7,
         .sg_tablesize           = 1,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .cmd_size               = NCR5380_CMD_SIZE,
         .max_sectors            = 128,
 };
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index d0c3f867fc58..dbe753fba486 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -2197,7 +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,
+        .dma_boundary = PAGE_SIZE - 1,
         .this_id = -1,
 };
 
diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
index f1abe38e3b3a..1d6dbd77bd0e 100644
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -2236,7 +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,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 /**
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index f47b36382afa..76a04cedfc83 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -1929,7 +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,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static struct myrs_hba *myrs_alloc_host(struct pci_dev *pdev,
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 5aac3e801903..00e3cbee55b8 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -274,7 +274,7 @@ static struct scsi_host_template nsp32_template = {
         .sg_tablesize                   = NSP32_SG_SIZE,
         .max_sectors                    = 128,
         .this_id                        = NSP32_HOST_SCSIID,
-        .use_clustering                 = DISABLE_CLUSTERING,
+        .dma_boundary                   = PAGE_SIZE - 1,
         .eh_abort_handler               = nsp32_eh_abort,
         .eh_host_reset_handler          = nsp32_eh_host_reset,
 /*      .highmem_io                     = 1, */
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index f3230494a8c9..1bd6825a4f14 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -86,7 +86,7 @@ static struct scsi_host_template nsp_driver_template = {
         .can_queue               = 1,
         .this_id                 = NSP_INITIATOR_ID,
         .sg_tablesize            = SG_ALL,
-        .use_clustering          = DISABLE_CLUSTERING,
+        .dma_boundary            = PAGE_SIZE - 1,
 };
 
 static nsp_hw_data nsp_data_base; /* attach <-> detect glue */
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 173351a8554b..828d53faf09a 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -72,7 +72,7 @@ static struct scsi_host_template qlogicfas_driver_template = {
         .can_queue              = 1,
         .this_id                = -1,
         .sg_tablesize           = SG_ALL,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 /*====================================================================*/
diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index 95431d605c24..8f709002f746 100644
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -193,7 +193,7 @@ static struct scsi_host_template qlogicfas_driver_template = {
         .can_queue              = 1,
         .this_id                = -1,
         .sg_tablesize           = SG_ALL,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static __init int qlogicfas_init(void)
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 57d418d7d74e..16cab45c0439 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -5866,7 +5866,8 @@ static int sdebug_driver_probe(struct device *dev)
 
         sdebug_driver_template.can_queue = sdebug_max_queue;
         if (!sdebug_clustering)
-                sdebug_driver_template.use_clustering = DISABLE_CLUSTERING;
+                sdebug_driver_template.dma_boundary = PAGE_SIZE - 1;
+
         hpnt = scsi_host_alloc(&sdebug_driver_template, sizeof(sdbg_host));
         if (NULL == hpnt) {
                 pr_err("scsi_host_alloc failed\n");
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 2d4fd6b4bd92..966b7cfebdf8 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2230,9 +2230,6 @@ void __scsi_init_queue(struct Scsi_Host *shost, struct request_queue *q)
         blk_queue_max_segment_size(q,
                 min(shost->max_segment_size, dma_get_max_seg_size(dev)));
 
-        if (shost->use_clustering == DISABLE_CLUSTERING)
-                q->limits.cluster = 0;
-
         /*
          * Set a reasonable default alignment:  The larger of 32-byte (dword),
          * which is a common minimum for HBAs, and the minimum DMA alignment,
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 5ed696dc9bbd..713bce998b0e 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -208,7 +208,7 @@ static struct scsi_host_template sgiwd93_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,
         .cmd_per_lun            = 8,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static int sgiwd93_probe(struct platform_device *pdev)
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index af9078320d4b..f6bef7ad65e7 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1489,7 +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,
+        .dma_boundary                   = PAGE_SIZE - 1,
 };
 
 static struct pci_device_id stex_pci_tbl[] = {
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 9492638296c8..95a7ea7eefa0 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -500,7 +500,7 @@ static struct scsi_host_template sun3_scsi_template = {
         .this_id                = 7,
         .sg_tablesize           = SG_NONE,
         .cmd_per_lun            = 2,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .cmd_size               = NCR5380_CMD_SIZE,
 };
 
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index e5800da0053d..34be397da0f3 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -6982,7 +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,
+        .dma_boundary           = PAGE_SIZE - 1,
 };
 
 static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg,
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index b0991e86587f..7bd7c0c0db6f 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -324,7 +324,7 @@ static struct scsi_host_template tcm_loop_driver_template = {
         .sg_tablesize           = 256,
         .cmd_per_lun            = 1024,
         .max_sectors            = 0xFFFF,
-        .use_clustering         = DISABLE_CLUSTERING,
+        .dma_boundary           = PAGE_SIZE - 1,
         .slave_alloc            = tcm_loop_slave_alloc,
         .module                 = THIS_MODULE,
         .track_queue_depth      = 1,
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 6c75a0a50b3a..36742e8e7edc 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -879,7 +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,
+        .dma_boundary = PAGE_SIZE - 1,
 };
 
 #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 834204681ca3..7ba34a0ca8bf 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -44,8 +44,6 @@ struct blk_queue_tags;
 #define MODE_INITIATOR 0x01
 #define MODE_TARGET 0x02
 
-#define DISABLE_CLUSTERING (-1)
-
 struct scsi_host_template {
         struct module *module;
         const char *name;
@@ -419,16 +417,6 @@ struct scsi_host_template {
         unsigned unchecked_isa_dma:1;
 
         /*
-         * True if this host adapter can make good use of clustering.
-         * I originally thought that if the tablesize was large that it
-         * was a waste of CPU cycles to prepare a cluster list, but
-         * it works out that the Buslogic is faster if you use a smaller
-         * number of segments (i.e. use clustering).  I guess it is
-         * inefficient.
-         */
-        unsigned use_clustering:1;
-
-        /*
          * True for emulated SCSI host adapters (e.g. ATAPI).
          */
         unsigned emulated:1;
@@ -626,7 +614,6 @@ struct Scsi_Host {
         
         unsigned active_mode:2;
         unsigned unchecked_isa_dma:1;
-        unsigned use_clustering:1;
 
         /*
          * Host has requested that no further requests come through for the