Merge tag 'v5.1-rc1' into spi-5.2

[linux-2.6-microblaze.git] / drivers / scsi / advansys.c

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 223ef6f..d375844 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",
@@ -10808,14 +10808,6 @@ static struct scsi_host_template advansys_template = {
         * for non-ISA adapters.
         */
        .unchecked_isa_dma = true,
-       /*
-        * All adapters controlled by this driver are capable of large
-        * scatter-gather lists. According to the mid-level SCSI documentation
-        * this obviates any performance gain provided by setting
-        * 'use_clustering'. But empirically while CPU utilization is increased
-        * by enabling clustering, I/O throughput increases as well.
-        */
-       .use_clustering = ENABLE_CLUSTERING,
 };
 
 static int advansys_wide_init_chip(struct Scsi_Host *shost)