scsi: Do not set cmd_per_lun to 1 in the host template

PATCH In review Hannes Reinecke 2 participants 2 messages Apr 29, 2015 – May 11, 2015

Subsystems (20)

SCSI USB PowerPC Staging +16 more subsystems

lore

Share & tools

lore

Hannes Reinecke

author

2015-04-29 06:57 UTC #0 lore raw

PATCH 1/1 scsi: Do not set cmd_per_lun to 1 in the host template

'0' is now used as the default cmd_per_lun value, so there's no need to explicitly set it to '1' in the host template.

Signed-off-by Hannes Reinecke <[email protected]>

---
 drivers/block/cciss_scsi.c          | 1 -
 drivers/firewire/sbp2.c             | 1 -
 drivers/s390/scsi/zfcp_scsi.c       | 1 -
 drivers/scsi/NCR53c406a.c           | 1 -
 drivers/scsi/a100u2w.c              | 1 -
 drivers/scsi/aha152x.c              | 1 -
 drivers/scsi/aha1542.c              | 1 -
 drivers/scsi/aha1740.c              | 1 -
 drivers/scsi/aha1740.h              | 1 -
 drivers/scsi/aic94xx/aic94xx_init.c | 1 -
 drivers/scsi/arm/arxescsi.c         | 1 -
 drivers/scsi/arm/cumana_2.c         | 1 -
 drivers/scsi/arm/eesox.c            | 1 -
 drivers/scsi/atp870u.c              | 1 -
 drivers/scsi/atp870u.h              | 1 -
 drivers/scsi/dpt_i2o.c              | 1 -
 drivers/scsi/fdomain.c              | 1 -
 drivers/scsi/imm.c                  | 1 -
 drivers/scsi/initio.c               | 1 -
 drivers/scsi/isci/init.c            | 1 -
 drivers/scsi/mac53c94.c             | 1 -
 drivers/scsi/mvsas/mv_init.c        | 1 -
 drivers/scsi/nsp32.c                | 1 -
 drivers/scsi/pcmcia/nsp_cs.c        | 1 -
 drivers/scsi/pcmcia/qlogic_stub.c   | 1 -
 drivers/scsi/pcmcia/sym53c500_cs.c  | 1 -
 drivers/scsi/pm8001/pm8001_init.c   | 1 -
 drivers/scsi/ppa.c                  | 1 -
 drivers/scsi/ps3rom.c               | 1 -
 drivers/scsi/qla1280.c              | 1 -
 drivers/scsi/qlogicfas.c            | 1 -
 drivers/scsi/qlogicpti.c            | 1 -
 drivers/scsi/sym53c416.c            | 1 -
 drivers/scsi/wd719x.c               | 1 -
 drivers/scsi/wd719x.h               | 2 --
 drivers/staging/rts5208/rtsx.c      | 1 -
 drivers/usb/image/microtek.c        | 1 -
 drivers/usb/storage/scsiglue.c      | 1 -
 drivers/usb/storage/uas.c           | 1 -
 include/linux/libata.h              | 2 --
 40 files changed, 42 deletions(-)

drivers/block/cciss_scsi.c +0 -1

index ecd845c..1537302 100644
@@ -84,7 +84,6 @@ static struct scsi_host_template cciss_driver_template = {
 	.show_info		= cciss_scsi_show_info,
 	.queuecommand		= cciss_scsi_queue_command,
 	.this_id		= 7,
-	.cmd_per_lun		= 1,
 	.use_clustering		= DISABLE_CLUSTERING,
 	/* Can't have eh_bus_reset_handler or eh_host_reset_handler for cciss */
 	.eh_device_reset_handler= cciss_eh_device_reset_handler,

drivers/firewire/sbp2.c +0 -1

index c22606f..6bac039 100644
@@ -1611,7 +1611,6 @@ static struct scsi_host_template scsi_driver_template = {
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
 	.use_clustering		= ENABLE_CLUSTERING,
-	.cmd_per_lun		= 1,
 	.can_queue		= 1,
 	.sdev_attrs		= sbp2_scsi_sysfs_attrs,
 };

drivers/s390/scsi/zfcp_scsi.c +0 -1

index 75f4bfc..b3c6ff4 100644
@@ -297,7 +297,6 @@ static struct scsi_host_template zfcp_scsi_host_template = {
 				     * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8,
 				   /* GCD, adjusted later */
 	.dma_boundary		 = ZFCP_QDIO_SBALE_LEN - 1,
-	.cmd_per_lun		 = 1,
 	.use_clustering		 = 1,
 	.shost_attrs		 = zfcp_sysfs_shost_attrs,
 	.sdev_attrs		 = zfcp_sysfs_sdev_attrs,

drivers/scsi/NCR53c406a.c +0 -1

index 42c7161..6e110c6 100644
@@ -1064,7 +1064,6 @@ static struct scsi_host_template driver_template =
      .can_queue         	= 1			/* can_queue */,        
      .this_id           	= 7			/* SCSI ID of the chip */,
      .sg_tablesize      	= 32			/*SG_ALL*/ /*SG_NONE*/, 
-     .cmd_per_lun       	= 1			/* commands per lun */, 
      .unchecked_isa_dma 	= 1			/* unchecked_isa_dma */,
      .use_clustering    	= ENABLE_CLUSTERING,
 };

drivers/scsi/a100u2w.c +0 -1

index 7e33a61..cac6b37 100644
@@ -1078,7 +1078,6 @@ static struct scsi_host_template inia100_template = {
 	.can_queue		= 1,
 	.this_id		= 1,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun 		= 1,
 	.use_clustering		= ENABLE_CLUSTERING,
 };

drivers/scsi/aha152x.c +0 -1

index e31c460..f44d048 100644
@@ -2922,7 +2922,6 @@ static struct scsi_host_template aha152x_driver_template = {
 	.can_queue			= 1,
 	.this_id			= 7,
 	.sg_tablesize			= SG_ALL,
-	.cmd_per_lun			= 1,
 	.use_clustering			= DISABLE_CLUSTERING,
 	.slave_alloc			= aha152x_adjust_queue,
 };

drivers/scsi/aha1542.c +0 -1

index ec43276..c0c4eae 100644
@@ -951,7 +951,6 @@ static struct scsi_host_template driver_template = {
 	.can_queue		= AHA1542_MAILBOXES, 
 	.this_id		= 7,
 	.sg_tablesize		= 16,
-	.cmd_per_lun		= 1,
 	.unchecked_isa_dma	= 1, 
 	.use_clustering		= ENABLE_CLUSTERING,
 };

drivers/scsi/aha1740.c +0 -1

index 31ace4b..bad35ff 100644
@@ -544,7 +544,6 @@ static struct scsi_host_template aha1740_template = {
 	.can_queue        = AHA1740_ECBS,
 	.this_id          = 7,
 	.sg_tablesize     = AHA1740_SCATTER,
-	.cmd_per_lun      = AHA1740_CMDLUN,
 	.use_clustering   = ENABLE_CLUSTERING,
 	.eh_abort_handler = aha1740_eh_abort_handler,
 };

drivers/scsi/aha1740.h +0 -1

index af23fd6..b0c5603 100644
@@ -149,6 +149,5 @@ struct ecb {			/* Enhanced Control Block 6.1 */
 
 #define AHA1740_ECBS 32
 #define AHA1740_SCATTER 16
-#define AHA1740_CMDLUN 1
 
 #endif

drivers/scsi/aic94xx/aic94xx_init.c +0 -1

index 02a2512..4b135cc 100644
@@ -65,7 +65,6 @@ static struct scsi_host_template aic94xx_sht = {
 	.change_queue_depth	= sas_change_queue_depth,
 	.bios_param		= sas_bios_param,
 	.can_queue		= 1,
-	.cmd_per_lun		= 1,
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
 	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

drivers/scsi/arm/arxescsi.c +0 -1

index 32d2321..3110736 100644
@@ -245,7 +245,6 @@ static struct scsi_host_template arxescsi_template = {
 	.can_queue			= 0,
 	.this_id			= 7,
 	.sg_tablesize			= SG_ALL,
-	.cmd_per_lun			= 1,
 	.use_clustering			= DISABLE_CLUSTERING,
 	.proc_name			= "arxescsi",
 };

drivers/scsi/arm/cumana_2.c +0 -1

index abc66f5..faa1bee 100644
@@ -367,7 +367,6 @@ static struct scsi_host_template cumanascsi2_template = {
 	.this_id			= 7,
 	.sg_tablesize			= SCSI_MAX_SG_CHAIN_SEGMENTS,
 	.dma_boundary			= IOMD_DMA_BOUNDARY,
-	.cmd_per_lun			= 1,
 	.use_clustering			= DISABLE_CLUSTERING,
 	.proc_name			= "cumanascsi2",
 };

drivers/scsi/arm/eesox.c +0 -1

index 5bf3c0d..a8ad688 100644
@@ -486,7 +486,6 @@ static struct scsi_host_template eesox_template = {
 	.this_id			= 7,
 	.sg_tablesize			= SCSI_MAX_SG_CHAIN_SEGMENTS,
 	.dma_boundary			= IOMD_DMA_BOUNDARY,
-	.cmd_per_lun			= 1,
 	.use_clustering			= DISABLE_CLUSTERING,
 	.proc_name			= "eesox",
 };

drivers/scsi/atp870u.c +0 -1

index 0836433..05301bc 100644
@@ -3158,7 +3158,6 @@ static struct scsi_host_template atp870u_template = {
      .can_queue         	= qcnt			/* can_queue */,
      .this_id           	= 7			/* SCSI ID */,
      .sg_tablesize      	= ATP870U_SCATTER	/*SG_ALL*/ /*SG_NONE*/,
-     .cmd_per_lun       	= ATP870U_CMDLUN		/* commands per lun */,
      .use_clustering    	= ENABLE_CLUSTERING,
      .max_sectors		= ATP870U_MAX_SECTORS,
 };

drivers/scsi/atp870u.h +0 -1

index 62bae64..5cf6256 100644
@@ -10,7 +10,6 @@
 #define MAX_SENSE 	14
 #define qcnt	       	32
 #define ATP870U_SCATTER 	128
-#define ATP870U_CMDLUN  	1
 
 #define MAX_ADAPTER	8
 #define MAX_SCSI_ID	16

drivers/scsi/dpt_i2o.c +0 -1

index 2806cfb..f35ed53 100644
@@ -3562,7 +3562,6 @@ static struct scsi_host_template driver_template = {
 	.slave_configure	= adpt_slave_configure,
 	.can_queue		= MAX_TO_IOP_MESSAGES,
 	.this_id		= 7,
-	.cmd_per_lun		= 1,
 	.use_clustering		= ENABLE_CLUSTERING,
 };

drivers/scsi/fdomain.c +0 -1

index fff6829..eefe14d 100644
@@ -1764,7 +1764,6 @@ struct scsi_host_template fdomain_driver_template = {
 	.can_queue		= 1,
 	.this_id		= 6,
 	.sg_tablesize		= 64,
-	.cmd_per_lun		= 1,
 	.use_clustering		= DISABLE_CLUSTERING,
 };

drivers/scsi/imm.c +0 -1

index 89a8266..4e1a632 100644
@@ -1109,7 +1109,6 @@ static struct scsi_host_template imm_template = {
 	.bios_param		= imm_biosparam,
 	.this_id		= 7,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= 1,
 	.use_clustering		= ENABLE_CLUSTERING,
 	.can_queue		= 1,
 	.slave_alloc		= imm_adjust_queue,

drivers/scsi/initio.c +0 -1

index e5dae7b..6a926ba 100644
@@ -2833,7 +2833,6 @@ static struct scsi_host_template initio_template = {
 	.can_queue		= MAX_TARGETS * i91u_MAXQUEUE,
 	.this_id		= 1,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= 1,
 	.use_clustering		= ENABLE_CLUSTERING,
 };

drivers/scsi/isci/init.c +0 -1

index cd41b63..0dfcabe 100644
@@ -160,7 +160,6 @@ static struct scsi_host_template isci_sht = {
 	.change_queue_depth		= sas_change_queue_depth,
 	.bios_param			= sas_bios_param,
 	.can_queue			= ISCI_CAN_QUEUE_VAL,
-	.cmd_per_lun			= 1,
 	.this_id			= -1,
 	.sg_tablesize			= SG_ALL,
 	.max_sectors			= SCSI_DEFAULT_MAX_SECTORS,

drivers/scsi/mac53c94.c +0 -1

index 0adb2e0..1412266 100644
@@ -403,7 +403,6 @@ static struct scsi_host_template mac53c94_template = {
 	.can_queue	= 1,
 	.this_id	= 7,
 	.sg_tablesize	= SG_ALL,
-	.cmd_per_lun	= 1,
 	.use_clustering	= DISABLE_CLUSTERING,
 };

drivers/scsi/mvsas/mv_init.c +0 -1

index 53030b0..d40d734 100644
@@ -56,7 +56,6 @@ static struct scsi_host_template mvs_sht = {
 	.change_queue_depth	= sas_change_queue_depth,
 	.bios_param		= sas_bios_param,
 	.can_queue		= 1,
-	.cmd_per_lun		= 1,
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
 	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

drivers/scsi/nsp32.c +0 -1

index c6077ce..53c8477 100644
@@ -274,7 +274,6 @@ static struct scsi_host_template nsp32_template = {
 	.can_queue			= 1,
 	.sg_tablesize			= NSP32_SG_SIZE,
 	.max_sectors			= 128,
-	.cmd_per_lun			= 1,
 	.this_id			= NSP32_HOST_SCSIID,
 	.use_clustering			= DISABLE_CLUSTERING,
 	.eh_abort_handler       	= nsp32_eh_abort,

drivers/scsi/pcmcia/nsp_cs.c +0 -1

index 1b6c883..5fb6eef 100644
@@ -86,7 +86,6 @@ static struct scsi_host_template nsp_driver_template = {
 	.can_queue		 = 1,
 	.this_id		 = NSP_INITIATOR_ID,
 	.sg_tablesize		 = SG_ALL,
-	.cmd_per_lun		 = 1,
 	.use_clustering		 = DISABLE_CLUSTERING,
 };

drivers/scsi/pcmcia/qlogic_stub.c +0 -1

index bcaf89f..c670dc7 100644
@@ -72,7 +72,6 @@ static struct scsi_host_template qlogicfas_driver_template = {
 	.can_queue		= 1,
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= 1,
 	.use_clustering		= DISABLE_CLUSTERING,
 };

drivers/scsi/pcmcia/sym53c500_cs.c +0 -1

index 155f957..20011c8 100644
@@ -680,7 +680,6 @@ static struct scsi_host_template sym53c500_driver_template = {
      .can_queue			= 1,
      .this_id			= 7,
      .sg_tablesize		= 32,
-     .cmd_per_lun		= 1,
      .use_clustering		= ENABLE_CLUSTERING,
      .shost_attrs		= SYM53C500_shost_attrs
 };

drivers/scsi/pm8001/pm8001_init.c +0 -1

index 6555591..a132f26 100644
@@ -78,7 +78,6 @@ static struct scsi_host_template pm8001_sht = {
 	.change_queue_depth	= sas_change_queue_depth,
 	.bios_param		= sas_bios_param,
 	.can_queue		= 1,
-	.cmd_per_lun		= 1,
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
 	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,

drivers/scsi/ppa.c +0 -1

index 1db8b26..ee00e27 100644
@@ -974,7 +974,6 @@ static struct scsi_host_template ppa_template = {
 	.bios_param		= ppa_biosparam,
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= 1,
 	.use_clustering		= ENABLE_CLUSTERING,
 	.can_queue		= 1,
 	.slave_alloc		= ppa_adjust_queue,

drivers/scsi/ps3rom.c +0 -1

index 5298def..4924424 100644
@@ -347,7 +347,6 @@ static struct scsi_host_template ps3rom_host_template = {
 	.can_queue =		1,
 	.this_id =		7,
 	.sg_tablesize =		SG_ALL,
-	.cmd_per_lun =		1,
 	.emulated =             1,		/* only sg driver uses this */
 	.max_sectors =		PS3ROM_MAX_SECTORS,
 	.use_clustering =	ENABLE_CLUSTERING,

drivers/scsi/qla1280.c +0 -1

index c68a66e..5d0ec42 100644
@@ -4217,7 +4217,6 @@ static struct scsi_host_template qla1280_driver_template = {
 	.can_queue		= 0xfffff,
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= 1,
 	.use_clustering		= ENABLE_CLUSTERING,
 };

drivers/scsi/qlogicfas.c +0 -1

index a22bb1b..61cac87 100644
@@ -193,7 +193,6 @@ static struct scsi_host_template qlogicfas_driver_template = {
 	.can_queue		= 1,
 	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
-	.cmd_per_lun		= 1,
 	.use_clustering		= DISABLE_CLUSTERING,
 };

drivers/scsi/qlogicpti.c +0 -1

index fe12270..676385f 100644
@@ -1287,7 +1287,6 @@ static struct scsi_host_template qpti_template = {
 	.can_queue		= QLOGICPTI_REQ_QUEUE_LEN,
 	.this_id		= 7,
 	.sg_tablesize		= QLOGICPTI_MAX_SG(QLOGICPTI_REQ_QUEUE_LEN),
-	.cmd_per_lun		= 1,
 	.use_clustering		= ENABLE_CLUSTERING,
 };

drivers/scsi/sym53c416.c +0 -1

index 0b7819f..5bdcbe8 100644
@@ -838,7 +838,6 @@ static struct scsi_host_template driver_template = {
 	.can_queue =		1,
 	.this_id =		SYM53C416_SCSI_ID,
 	.sg_tablesize =		32,
-	.cmd_per_lun =		1,
 	.unchecked_isa_dma =	1,
 	.use_clustering =	ENABLE_CLUSTERING,
 };

drivers/scsi/wd719x.c +0 -1

index 289ad01..61346aa 100644
@@ -882,7 +882,6 @@ static struct scsi_host_template wd719x_template = {
 	.can_queue			= 255,
 	.this_id			= 7,
 	.sg_tablesize			= WD719X_SG,
-	.cmd_per_lun			= WD719X_CMD_PER_LUN,
 	.use_clustering			= ENABLE_CLUSTERING,
 };

drivers/scsi/wd719x.h +0 -2

index 185e30e..9c6dd45 100644
@@ -2,8 +2,6 @@
 #define _WD719X_H_
 
 #define WD719X_SG 255		/* Scatter/gather size */
-#define WD719X_CMD_PER_LUN 1	/* We should be able to do linked commands, but
-				 * this is 1 for now to be safe. */
 
 struct wd719x_sglist {
 	__le32 ptr;

drivers/staging/rts5208/rtsx.c +0 -1

index d64b6ed..aed49bf 100644
@@ -230,7 +230,6 @@ static struct scsi_host_template rtsx_host_template = {
 
 	/* queue commands only, only one command per LUN */
 	.can_queue =			1,
-	.cmd_per_lun =			1,
 
 	/* unknown initiator id */
 	.this_id =			-1,

drivers/usb/image/microtek.c +0 -1

index 6431d08..a4dbb0c 100644
@@ -635,7 +635,6 @@ static struct scsi_host_template mts_scsi_host_template = {
 	.sg_tablesize =		SG_ALL,
 	.can_queue =		1,
 	.this_id =		-1,
-	.cmd_per_lun =		1,
 	.use_clustering =	1,
 	.emulated =		1,
 	.slave_alloc =		mts_slave_alloc,

drivers/usb/storage/scsiglue.c +0 -1

index 0e400f3..996ef1e 100644
@@ -558,7 +558,6 @@ struct scsi_host_template usb_stor_host_template = {
 
 	/* queue commands only, only one command per LUN */
 	.can_queue =			1,
-	.cmd_per_lun =			1,
 
 	/* unknown initiator id */
 	.this_id =			-1,

drivers/usb/storage/uas.c +0 -1

index 6cdabdc..56b97fe 100644
@@ -803,7 +803,6 @@ static struct scsi_host_template uas_host_template = {
 	.can_queue = 65536,	/* Is there a limit on the _host_ ? */
 	.this_id = -1,
 	.sg_tablesize = SG_NONE,
-	.cmd_per_lun = 1,	/* until we override it */
 	.skip_settle_delay = 1,
 	.use_blk_tags = 1,
 };

include/linux/libata.h +0 -2

index 8dad4a3..1402291 100644
@@ -134,7 +134,6 @@ enum {
 	ATA_ALL_DEVICES		= (1 << ATA_MAX_DEVICES) - 1,
 
 	ATA_SHT_EMULATED	= 1,
-	ATA_SHT_CMD_PER_LUN	= 1,
 	ATA_SHT_THIS_ID		= -1,
 	ATA_SHT_USE_CLUSTERING	= 1,

@@ -1354,7 +1353,6 @@ extern struct device_attribute *ata_common_sdev_attrs[];
 	.can_queue		= ATA_DEF_QUEUE,		\
 	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,		\
 	.this_id		= ATA_SHT_THIS_ID,		\
-	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,		\
 	.emulated		= ATA_SHT_EMULATED,		\
 	.use_clustering		= ATA_SHT_USE_CLUSTERING,	\
 	.proc_name		= drv_name,			\

Signature · 1 line

1.8.5.2

Christoph Hellwig

Reviewed-by on v1 1/1

2015-05-11 09:07 UTC #1 lore raw

Quoted 3 lines · Hannes Reinecke

'0' is now used as the default cmd_per_lun value, so there's no need to explicitly set it to '1' in the host template.

Looks good,

Reviewed-by Christoph Hellwig <[email protected]>