Commit b84b1d52 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley

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's avatarHannes Reinecke <[email protected]>
Reviewed-by: default avatarChristoph Hellwig <[email protected]>
Signed-off-by: default avatarJames Bottomley <[email protected]>
parent f532a3f9
...@@ -84,7 +84,6 @@ static struct scsi_host_template cciss_driver_template = { ...@@ -84,7 +84,6 @@ static struct scsi_host_template cciss_driver_template = {
.show_info = cciss_scsi_show_info, .show_info = cciss_scsi_show_info,
.queuecommand = cciss_scsi_queue_command, .queuecommand = cciss_scsi_queue_command,
.this_id = 7, .this_id = 7,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
/* Can't have eh_bus_reset_handler or eh_host_reset_handler for cciss */ /* Can't have eh_bus_reset_handler or eh_host_reset_handler for cciss */
.eh_device_reset_handler= cciss_eh_device_reset_handler, .eh_device_reset_handler= cciss_eh_device_reset_handler,
......
...@@ -1611,7 +1611,6 @@ static struct scsi_host_template scsi_driver_template = { ...@@ -1611,7 +1611,6 @@ static struct scsi_host_template scsi_driver_template = {
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
.cmd_per_lun = 1,
.can_queue = 1, .can_queue = 1,
.sdev_attrs = sbp2_scsi_sysfs_attrs, .sdev_attrs = sbp2_scsi_sysfs_attrs,
}; };
......
...@@ -297,7 +297,6 @@ static struct scsi_host_template zfcp_scsi_host_template = { ...@@ -297,7 +297,6 @@ static struct scsi_host_template zfcp_scsi_host_template = {
* ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8, * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8,
/* GCD, adjusted later */ /* GCD, adjusted later */
.dma_boundary = ZFCP_QDIO_SBALE_LEN - 1, .dma_boundary = ZFCP_QDIO_SBALE_LEN - 1,
.cmd_per_lun = 1,
.use_clustering = 1, .use_clustering = 1,
.shost_attrs = zfcp_sysfs_shost_attrs, .shost_attrs = zfcp_sysfs_shost_attrs,
.sdev_attrs = zfcp_sysfs_sdev_attrs, .sdev_attrs = zfcp_sysfs_sdev_attrs,
......
...@@ -1064,7 +1064,6 @@ static struct scsi_host_template driver_template = ...@@ -1064,7 +1064,6 @@ static struct scsi_host_template driver_template =
.can_queue = 1 /* can_queue */, .can_queue = 1 /* can_queue */,
.this_id = 7 /* SCSI ID of the chip */, .this_id = 7 /* SCSI ID of the chip */,
.sg_tablesize = 32 /*SG_ALL*/ /*SG_NONE*/, .sg_tablesize = 32 /*SG_ALL*/ /*SG_NONE*/,
.cmd_per_lun = 1 /* commands per lun */,
.unchecked_isa_dma = 1 /* unchecked_isa_dma */, .unchecked_isa_dma = 1 /* unchecked_isa_dma */,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -1078,7 +1078,6 @@ static struct scsi_host_template inia100_template = { ...@@ -1078,7 +1078,6 @@ static struct scsi_host_template inia100_template = {
.can_queue = 1, .can_queue = 1,
.this_id = 1, .this_id = 1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -2922,7 +2922,6 @@ static struct scsi_host_template aha152x_driver_template = { ...@@ -2922,7 +2922,6 @@ static struct scsi_host_template aha152x_driver_template = {
.can_queue = 1, .can_queue = 1,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
.slave_alloc = aha152x_adjust_queue, .slave_alloc = aha152x_adjust_queue,
}; };
......
...@@ -950,7 +950,6 @@ static struct scsi_host_template driver_template = { ...@@ -950,7 +950,6 @@ static struct scsi_host_template driver_template = {
.can_queue = AHA1542_MAILBOXES, .can_queue = AHA1542_MAILBOXES,
.this_id = 7, .this_id = 7,
.sg_tablesize = 16, .sg_tablesize = 16,
.cmd_per_lun = 1,
.unchecked_isa_dma = 1, .unchecked_isa_dma = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -544,7 +544,6 @@ static struct scsi_host_template aha1740_template = { ...@@ -544,7 +544,6 @@ static struct scsi_host_template aha1740_template = {
.can_queue = AHA1740_ECBS, .can_queue = AHA1740_ECBS,
.this_id = 7, .this_id = 7,
.sg_tablesize = AHA1740_SCATTER, .sg_tablesize = AHA1740_SCATTER,
.cmd_per_lun = AHA1740_CMDLUN,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
.eh_abort_handler = aha1740_eh_abort_handler, .eh_abort_handler = aha1740_eh_abort_handler,
}; };
......
...@@ -149,6 +149,5 @@ struct ecb { /* Enhanced Control Block 6.1 */ ...@@ -149,6 +149,5 @@ struct ecb { /* Enhanced Control Block 6.1 */
#define AHA1740_ECBS 32 #define AHA1740_ECBS 32
#define AHA1740_SCATTER 16 #define AHA1740_SCATTER 16
#define AHA1740_CMDLUN 1
#endif #endif
...@@ -65,7 +65,6 @@ static struct scsi_host_template aic94xx_sht = { ...@@ -65,7 +65,6 @@ static struct scsi_host_template aic94xx_sht = {
.change_queue_depth = sas_change_queue_depth, .change_queue_depth = sas_change_queue_depth,
.bios_param = sas_bios_param, .bios_param = sas_bios_param,
.can_queue = 1, .can_queue = 1,
.cmd_per_lun = 1,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.max_sectors = SCSI_DEFAULT_MAX_SECTORS, .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
......
...@@ -245,7 +245,6 @@ static struct scsi_host_template arxescsi_template = { ...@@ -245,7 +245,6 @@ static struct scsi_host_template arxescsi_template = {
.can_queue = 0, .can_queue = 0,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
.proc_name = "arxescsi", .proc_name = "arxescsi",
}; };
......
...@@ -367,7 +367,6 @@ static struct scsi_host_template cumanascsi2_template = { ...@@ -367,7 +367,6 @@ static struct scsi_host_template cumanascsi2_template = {
.this_id = 7, .this_id = 7,
.sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS,
.dma_boundary = IOMD_DMA_BOUNDARY, .dma_boundary = IOMD_DMA_BOUNDARY,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
.proc_name = "cumanascsi2", .proc_name = "cumanascsi2",
}; };
......
...@@ -486,7 +486,6 @@ static struct scsi_host_template eesox_template = { ...@@ -486,7 +486,6 @@ static struct scsi_host_template eesox_template = {
.this_id = 7, .this_id = 7,
.sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS,
.dma_boundary = IOMD_DMA_BOUNDARY, .dma_boundary = IOMD_DMA_BOUNDARY,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
.proc_name = "eesox", .proc_name = "eesox",
}; };
......
...@@ -3158,7 +3158,6 @@ static struct scsi_host_template atp870u_template = { ...@@ -3158,7 +3158,6 @@ static struct scsi_host_template atp870u_template = {
.can_queue = qcnt /* can_queue */, .can_queue = qcnt /* can_queue */,
.this_id = 7 /* SCSI ID */, .this_id = 7 /* SCSI ID */,
.sg_tablesize = ATP870U_SCATTER /*SG_ALL*/ /*SG_NONE*/, .sg_tablesize = ATP870U_SCATTER /*SG_ALL*/ /*SG_NONE*/,
.cmd_per_lun = ATP870U_CMDLUN /* commands per lun */,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
.max_sectors = ATP870U_MAX_SECTORS, .max_sectors = ATP870U_MAX_SECTORS,
}; };
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#define MAX_SENSE 14 #define MAX_SENSE 14
#define qcnt 32 #define qcnt 32
#define ATP870U_SCATTER 128 #define ATP870U_SCATTER 128
#define ATP870U_CMDLUN 1
#define MAX_ADAPTER 8 #define MAX_ADAPTER 8
#define MAX_SCSI_ID 16 #define MAX_SCSI_ID 16
......
...@@ -3562,7 +3562,6 @@ static struct scsi_host_template driver_template = { ...@@ -3562,7 +3562,6 @@ static struct scsi_host_template driver_template = {
.slave_configure = adpt_slave_configure, .slave_configure = adpt_slave_configure,
.can_queue = MAX_TO_IOP_MESSAGES, .can_queue = MAX_TO_IOP_MESSAGES,
.this_id = 7, .this_id = 7,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -1764,7 +1764,6 @@ struct scsi_host_template fdomain_driver_template = { ...@@ -1764,7 +1764,6 @@ struct scsi_host_template fdomain_driver_template = {
.can_queue = 1, .can_queue = 1,
.this_id = 6, .this_id = 6,
.sg_tablesize = 64, .sg_tablesize = 64,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
}; };
......
...@@ -1109,7 +1109,6 @@ static struct scsi_host_template imm_template = { ...@@ -1109,7 +1109,6 @@ static struct scsi_host_template imm_template = {
.bios_param = imm_biosparam, .bios_param = imm_biosparam,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
.can_queue = 1, .can_queue = 1,
.slave_alloc = imm_adjust_queue, .slave_alloc = imm_adjust_queue,
......
...@@ -2833,7 +2833,6 @@ static struct scsi_host_template initio_template = { ...@@ -2833,7 +2833,6 @@ static struct scsi_host_template initio_template = {
.can_queue = MAX_TARGETS * i91u_MAXQUEUE, .can_queue = MAX_TARGETS * i91u_MAXQUEUE,
.this_id = 1, .this_id = 1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -160,7 +160,6 @@ static struct scsi_host_template isci_sht = { ...@@ -160,7 +160,6 @@ static struct scsi_host_template isci_sht = {
.change_queue_depth = sas_change_queue_depth, .change_queue_depth = sas_change_queue_depth,
.bios_param = sas_bios_param, .bios_param = sas_bios_param,
.can_queue = ISCI_CAN_QUEUE_VAL, .can_queue = ISCI_CAN_QUEUE_VAL,
.cmd_per_lun = 1,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.max_sectors = SCSI_DEFAULT_MAX_SECTORS, .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
......
...@@ -403,7 +403,6 @@ static struct scsi_host_template mac53c94_template = { ...@@ -403,7 +403,6 @@ static struct scsi_host_template mac53c94_template = {
.can_queue = 1, .can_queue = 1,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
}; };
......
...@@ -56,7 +56,6 @@ static struct scsi_host_template mvs_sht = { ...@@ -56,7 +56,6 @@ static struct scsi_host_template mvs_sht = {
.change_queue_depth = sas_change_queue_depth, .change_queue_depth = sas_change_queue_depth,
.bios_param = sas_bios_param, .bios_param = sas_bios_param,
.can_queue = 1, .can_queue = 1,
.cmd_per_lun = 1,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.max_sectors = SCSI_DEFAULT_MAX_SECTORS, .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
......
...@@ -274,7 +274,6 @@ static struct scsi_host_template nsp32_template = { ...@@ -274,7 +274,6 @@ static struct scsi_host_template nsp32_template = {
.can_queue = 1, .can_queue = 1,
.sg_tablesize = NSP32_SG_SIZE, .sg_tablesize = NSP32_SG_SIZE,
.max_sectors = 128, .max_sectors = 128,
.cmd_per_lun = 1,
.this_id = NSP32_HOST_SCSIID, .this_id = NSP32_HOST_SCSIID,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
.eh_abort_handler = nsp32_eh_abort, .eh_abort_handler = nsp32_eh_abort,
......
...@@ -86,7 +86,6 @@ static struct scsi_host_template nsp_driver_template = { ...@@ -86,7 +86,6 @@ static struct scsi_host_template nsp_driver_template = {
.can_queue = 1, .can_queue = 1,
.this_id = NSP_INITIATOR_ID, .this_id = NSP_INITIATOR_ID,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
}; };
......
...@@ -72,7 +72,6 @@ static struct scsi_host_template qlogicfas_driver_template = { ...@@ -72,7 +72,6 @@ static struct scsi_host_template qlogicfas_driver_template = {
.can_queue = 1, .can_queue = 1,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
}; };
......
...@@ -680,7 +680,6 @@ static struct scsi_host_template sym53c500_driver_template = { ...@@ -680,7 +680,6 @@ static struct scsi_host_template sym53c500_driver_template = {
.can_queue = 1, .can_queue = 1,
.this_id = 7, .this_id = 7,
.sg_tablesize = 32, .sg_tablesize = 32,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
.shost_attrs = SYM53C500_shost_attrs .shost_attrs = SYM53C500_shost_attrs
}; };
......
...@@ -78,7 +78,6 @@ static struct scsi_host_template pm8001_sht = { ...@@ -78,7 +78,6 @@ static struct scsi_host_template pm8001_sht = {
.change_queue_depth = sas_change_queue_depth, .change_queue_depth = sas_change_queue_depth,
.bios_param = sas_bios_param, .bios_param = sas_bios_param,
.can_queue = 1, .can_queue = 1,
.cmd_per_lun = 1,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.max_sectors = SCSI_DEFAULT_MAX_SECTORS, .max_sectors = SCSI_DEFAULT_MAX_SECTORS,
......
...@@ -974,7 +974,6 @@ static struct scsi_host_template ppa_template = { ...@@ -974,7 +974,6 @@ static struct scsi_host_template ppa_template = {
.bios_param = ppa_biosparam, .bios_param = ppa_biosparam,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
.can_queue = 1, .can_queue = 1,
.slave_alloc = ppa_adjust_queue, .slave_alloc = ppa_adjust_queue,
......
...@@ -347,7 +347,6 @@ static struct scsi_host_template ps3rom_host_template = { ...@@ -347,7 +347,6 @@ static struct scsi_host_template ps3rom_host_template = {
.can_queue = 1, .can_queue = 1,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.emulated = 1, /* only sg driver uses this */ .emulated = 1, /* only sg driver uses this */
.max_sectors = PS3ROM_MAX_SECTORS, .max_sectors = PS3ROM_MAX_SECTORS,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
......
...@@ -4217,7 +4217,6 @@ static struct scsi_host_template qla1280_driver_template = { ...@@ -4217,7 +4217,6 @@ static struct scsi_host_template qla1280_driver_template = {
.can_queue = 0xfffff, .can_queue = 0xfffff,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -193,7 +193,6 @@ static struct scsi_host_template qlogicfas_driver_template = { ...@@ -193,7 +193,6 @@ static struct scsi_host_template qlogicfas_driver_template = {
.can_queue = 1, .can_queue = 1,
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,
}; };
......
...@@ -1287,7 +1287,6 @@ static struct scsi_host_template qpti_template = { ...@@ -1287,7 +1287,6 @@ static struct scsi_host_template qpti_template = {
.can_queue = QLOGICPTI_REQ_QUEUE_LEN, .can_queue = QLOGICPTI_REQ_QUEUE_LEN,
.this_id = 7, .this_id = 7,
.sg_tablesize = QLOGICPTI_MAX_SG(QLOGICPTI_REQ_QUEUE_LEN), .sg_tablesize = QLOGICPTI_MAX_SG(QLOGICPTI_REQ_QUEUE_LEN),
.cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -838,7 +838,6 @@ static struct scsi_host_template driver_template = { ...@@ -838,7 +838,6 @@ static struct scsi_host_template driver_template = {
.can_queue = 1, .can_queue = 1,
.this_id = SYM53C416_SCSI_ID, .this_id = SYM53C416_SCSI_ID,
.sg_tablesize = 32, .sg_tablesize = 32,
.cmd_per_lun = 1,
.unchecked_isa_dma = 1, .unchecked_isa_dma = 1,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -882,7 +882,6 @@ static struct scsi_host_template wd719x_template = { ...@@ -882,7 +882,6 @@ static struct scsi_host_template wd719x_template = {
.can_queue = 255, .can_queue = 255,
.this_id = 7, .this_id = 7,
.sg_tablesize = WD719X_SG, .sg_tablesize = WD719X_SG,
.cmd_per_lun = WD719X_CMD_PER_LUN,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
}; };
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#define _WD719X_H_ #define _WD719X_H_
#define WD719X_SG 255 /* Scatter/gather size */ #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 { struct wd719x_sglist {
__le32 ptr; __le32 ptr;
......
...@@ -230,7 +230,6 @@ static struct scsi_host_template rtsx_host_template = { ...@@ -230,7 +230,6 @@ static struct scsi_host_template rtsx_host_template = {
/* queue commands only, only one command per LUN */ /* queue commands only, only one command per LUN */
.can_queue = 1, .can_queue = 1,
.cmd_per_lun = 1,
/* unknown initiator id */ /* unknown initiator id */
.this_id = -1, .this_id = -1,
......
...@@ -635,7 +635,6 @@ static struct scsi_host_template mts_scsi_host_template = { ...@@ -635,7 +635,6 @@ static struct scsi_host_template mts_scsi_host_template = {
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.can_queue = 1, .can_queue = 1,
.this_id = -1, .this_id = -1,
.cmd_per_lun = 1,
.use_clustering = 1, .use_clustering = 1,
.emulated = 1, .emulated = 1,
.slave_alloc = mts_slave_alloc, .slave_alloc = mts_slave_alloc,
......
...@@ -558,7 +558,6 @@ struct scsi_host_template usb_stor_host_template = { ...@@ -558,7 +558,6 @@ struct scsi_host_template usb_stor_host_template = {
/* queue commands only, only one command per LUN */ /* queue commands only, only one command per LUN */
.can_queue = 1, .can_queue = 1,
.cmd_per_lun = 1,
/* unknown initiator id */ /* unknown initiator id */
.this_id = -1, .this_id = -1,
......
...@@ -803,7 +803,6 @@ static struct scsi_host_template uas_host_template = { ...@@ -803,7 +803,6 @@ static struct scsi_host_template uas_host_template = {
.can_queue = 65536, /* Is there a limit on the _host_ ? */ .can_queue = 65536, /* Is there a limit on the _host_ ? */
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_NONE, .sg_tablesize = SG_NONE,
.cmd_per_lun = 1, /* until we override it */
.skip_settle_delay = 1, .skip_settle_delay = 1,
.use_blk_tags = 1, .use_blk_tags = 1,
}; };
......
...@@ -134,7 +134,6 @@ enum { ...@@ -134,7 +134,6 @@ enum {
ATA_ALL_DEVICES = (1 << ATA_MAX_DEVICES) - 1, ATA_ALL_DEVICES = (1 << ATA_MAX_DEVICES) - 1,
ATA_SHT_EMULATED = 1, ATA_SHT_EMULATED = 1,
ATA_SHT_CMD_PER_LUN = 1,
ATA_SHT_THIS_ID = -1, ATA_SHT_THIS_ID = -1,
ATA_SHT_USE_CLUSTERING = 1, ATA_SHT_USE_CLUSTERING = 1,
...@@ -1354,7 +1353,6 @@ extern struct device_attribute *ata_common_sdev_attrs[]; ...@@ -1354,7 +1353,6 @@ extern struct device_attribute *ata_common_sdev_attrs[];
.can_queue = ATA_DEF_QUEUE, \ .can_queue = ATA_DEF_QUEUE, \
.tag_alloc_policy = BLK_TAG_ALLOC_RR, \ .tag_alloc_policy = BLK_TAG_ALLOC_RR, \
.this_id = ATA_SHT_THIS_ID, \ .this_id = ATA_SHT_THIS_ID, \
.cmd_per_lun = ATA_SHT_CMD_PER_LUN, \
.emulated = ATA_SHT_EMULATED, \ .emulated = ATA_SHT_EMULATED, \
.use_clustering = ATA_SHT_USE_CLUSTERING, \ .use_clustering = ATA_SHT_USE_CLUSTERING, \
.proc_name = drv_name, \ .proc_name = drv_name, \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment