scsi: remove the use_clustering flag

The same effects can be achieved by setting the dma_boundary to
PAGE_SIZE - 1 and the max_segment_size to PAGE_SIZE, so shift those
settings into the drivers.  Note that in many cases the setting might
be bogus, but this keeps the status quo.

[mkp: fix myrs and myrb]

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

diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index 177c031763c00f9212ec096286a8ffd1e166ee1f..c1dd4939f4ae55b55115a9e4104b542e2707b56c 100644 (file)
--- 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 7e1426e76d966e927140102929506c3b73bf2844..f86844fc0725bd1c25e1b5b9cb3fac6f2176b43a 100644 (file)
--- 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 61aadc7acb4998a58f27cb1872d883d7e771378d..c96bc7261a42af9aaf2091947e9b635d415e5021 100644 (file)
--- 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 95b4793c33f402b0413273553d8dc55dc8c68180..d37584403c334be483283097581c25c799cde78c 100644 (file)
--- 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 301b3cad15f88f6d4c9022d3e763a625a35172ff..97872838b9837988e0ae4c18ce729a3d40727792 100644 (file)
--- 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 421fe869a11ef0cbdb8130aa7b8ebdffbc775236..d7509859dc007bb18a31f62bf647a2b5004fa1c9 100644 (file)
--- 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 3110736fd337096116e558334fc05660c8fd45d3..5e9dd9f34821215801608f812cd737c7214fce24 100644 (file)
--- 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 ae1d809904fb7f63526bfd882443eb87fd5bb7e8..e2d2a81d8e0b582942eae6aca3aaa1296f82a081 100644 (file)
--- 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 05b7f755499b1dcad1c90cb353d9758299ac15f8..8f2efaab8d460ba1912a48e5c080f6c2cccbe602 100644 (file)
--- 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 89f5154c40b6ec1a61fb259ecd7f20c7441107c3..a503dc50c4f805b81fb7e68beff664b7c7e8b908 100644 (file)
--- 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 bf07735275a49d7720e98b4af5c4ef7c7693f72b..8a20411699d9ed73900ab65685d1f6d552068372 100644 (file)
--- 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 064ef57351828c59aaf17e3d7df12e1305306b46..762337de1116dcc9888a5597ef125875c3c5850a 100644 (file)
--- 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 8c55ec6e1827ef01e95efcb672fc3abeaa3f378e..13fbb2eab842e63e489aee8dd14ccef4d475bebf 100644 (file)
--- 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 003c3d72623842a7ba4b8f2b71dbb5c15fd68475..8db1cc552932dca29271ba818eced2849cda00bf 100644 (file)
--- 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 fc538181f8df16a2839835d442257a66875f6f82..9cdca06254988db8770255e1907ec246f0bb9ad4 100644 (file)
--- 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 a27fc49ebd3acd5ed7063e8254d6736fca5ca4e6..d2acd0d826e2be899ba9529a675e2e88a879b85f 100644 (file)
--- 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 e8148ba414a3d03a8eb52bcec525b22ad4dc3a31..fce0b5d7119e59f0a5a4bcb01661177356583749 100644 (file)
--- 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 0677252950837c677ce8c3b5bb9d4b32debf8469..e8bc8d328bab6862c3c1cc70bd121af9543197cd 100644 (file)
--- 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 23354f206533b92acd9e06f11aa777f4bf6cc5b4..0175684a14dcf77bb8a1bb8943ba54c599a044fe 100644 (file)
--- 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 764d320bb2ca202e327459954cf7a4140929722c..ee741207fd4e497d77aed39919866e3015072f5c 100644 (file)
--- 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 dd6057359d7c6e681544b9f7b2be5393b39c7f1a..8b4b5b1a13d74c44ffa81acf46b1383736289e25 100644 (file)
--- 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 d0c3f867fc580ef933f9fd4850184e57857b535b..dbe753fba4860a6343952aaa70b6bb34b1af0ace 100644 (file)
--- 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 f1abe38e3b3a59c3ae33f5b1b4885403fafd038d..1d6dbd77bd0ecccb13208686ceaddac73b4153fb 100644 (file)
--- 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 f47b36382afa7db4b672cf03db919ee179feab99..76a04cedfc83fd5bacbe1b8e4a93127d6145dc73 100644 (file)
--- 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 5aac3e8019034d34add7fdd14ce3ede73e6fec39..00e3cbee55b822b1e649e6c647e404501f68c55b 100644 (file)
--- 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 f3230494a8c95974de9dd59c802a6873a7645a40..1bd6825a4f142680feb0f2d6e2dbeb84fc85feb5 100644 (file)
--- 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 173351a8554bc58b5e84bad5b2b024942d363dd9..828d53faf09a37ad02157ff01334ff1108195136 100644 (file)
--- 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 95431d605c24c970563d863c11502fdb9b69eb3c..8f709002f746550edb4d950be18433317399a246 100644 (file)
--- 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 57d418d7d74e2f38543877b95ed4aa17ba3d8bc1..16cab45c043931229a685b5573d7df7f398b5e79 100644 (file)
--- 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 2d4fd6b4bd922baf9f743e2b8c62309ac4ddb9be..966b7cfebdf887b4723ee16df4c2e18f6fa22714 100644 (file)
--- 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 5ed696dc9bbd53a5bf9cd063b6e3915069bde473..713bce998b0e30d780a04b748391b17aa58842ef 100644 (file)
--- 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 af9078320d4bec08f0e3976761282b4a8c0bb267..f6bef7ad65e7d5071cfbce33ab3d1c1e84faa7c9 100644 (file)
--- 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 9492638296c86183d01bae23e5e5cabbac6a2f10..95a7ea7eefa0251cca63807de53052d6e364adfb 100644 (file)
--- 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 e5800da0053d0e265ce5c55fde963244d65b6f5f..34be397da0f3c10619e725b655ae215c0a28b1cc 100644 (file)
--- 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 b0991e86587fb9cd904185e9761eb8e2339f0be8..7bd7c0c0db6f17202eb85038af3d6cd19fb9467d 100644 (file)
--- 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 6c75a0a50b3a87b740b85e28cd203cf77f16b388..36742e8e7edcc1f67743f509e061a236b7f392f3 100644 (file)
--- 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 834204681ca359c3712d623e9018c8a5cea61d83..7ba34a0ca8bfecaa57d1d6069b142363fb743e78 100644 (file)
--- 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;
@@ -418,16 +416,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).
         */
@@ -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