Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4af14d11 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1c3726ad

Documentation/scsi/scsi_mid_low_api.txt

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/ia64/hp/sim/simscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/scsi/a2091.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/advansys.c

+2 −2
Original line number Diff line number Diff line
@@ -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",

drivers/scsi/aha152x.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};