diff options
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_device.c | 2 | ||||
| -rw-r--r-- | drivers/target/target_core_file.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_iblock.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_pscsi.c | 13 | ||||
| -rw-r--r-- | drivers/target/target_core_rd.c | 1 | ||||
| -rw-r--r-- | drivers/target/target_core_sbc.c | 6 | ||||
| -rw-r--r-- | drivers/target/target_core_spc.c | 2 |
7 files changed, 1 insertions, 25 deletions
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index 3c3a3019ce7b..066e8159afcd 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c @@ -1348,8 +1348,6 @@ static void scsi_dump_inquiry(struct se_device *dev) device_type = dev->transport->get_device_type(dev); pr_debug(" Type: %s ", scsi_device_type(device_type)); - pr_debug(" ANSI SCSI revision: %02x\n", - dev->transport->get_device_rev(dev)); } struct se_device *target_alloc_device(struct se_hba *hba, const char *name) diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index 2a3e2bbd8078..342a6a6dcca0 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c @@ -534,7 +534,6 @@ static struct se_subsystem_api fileio_template = { .parse_cdb = fd_parse_cdb, .set_configfs_dev_params = fd_set_configfs_dev_params, .show_configfs_dev_params = fd_show_configfs_dev_params, - .get_device_rev = sbc_get_device_rev, .get_device_type = sbc_get_device_type, .get_blocks = fd_get_blocks, }; diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 701877f9cd33..17fc01d6baea 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -725,7 +725,6 @@ static struct se_subsystem_api iblock_template = { .parse_cdb = iblock_parse_cdb, .set_configfs_dev_params = iblock_set_configfs_dev_params, .show_configfs_dev_params = iblock_show_configfs_dev_params, - .get_device_rev = sbc_get_device_rev, .get_device_type = sbc_get_device_type, .get_blocks = iblock_get_blocks, }; diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index dd6ac7c380c9..aa3e80a2f8db 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -1106,18 +1106,6 @@ fail: return -ENOMEM; } -/* pscsi_get_device_rev(): - * - * - */ -static u32 pscsi_get_device_rev(struct se_device *dev) -{ - struct pscsi_dev_virt *pdv = PSCSI_DEV(dev); - struct scsi_device *sd = pdv->pdv_sd; - - return (sd->scsi_level - 1) ? sd->scsi_level - 1 : 1; -} - /* pscsi_get_device_type(): * * @@ -1187,7 +1175,6 @@ static struct se_subsystem_api pscsi_template = { .parse_cdb = pscsi_parse_cdb, .set_configfs_dev_params = pscsi_set_configfs_dev_params, .show_configfs_dev_params = pscsi_show_configfs_dev_params, - .get_device_rev = pscsi_get_device_rev, .get_device_type = pscsi_get_device_type, .get_blocks = pscsi_get_blocks, }; diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c index 6348b6672526..92b1307a9931 100644 --- a/drivers/target/target_core_rd.c +++ b/drivers/target/target_core_rd.c @@ -449,7 +449,6 @@ static struct se_subsystem_api rd_mcp_template = { .parse_cdb = rd_parse_cdb, .set_configfs_dev_params = rd_set_configfs_dev_params, .show_configfs_dev_params = rd_show_configfs_dev_params, - .get_device_rev = sbc_get_device_rev, .get_device_type = sbc_get_device_type, .get_blocks = rd_get_blocks, }; diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c index 01686954cfa0..a4eb9c553654 100644 --- a/drivers/target/target_core_sbc.c +++ b/drivers/target/target_core_sbc.c @@ -604,12 +604,6 @@ out_invalid_cdb_field: } EXPORT_SYMBOL(sbc_parse_cdb); -u32 sbc_get_device_rev(struct se_device *dev) -{ - return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */ -} -EXPORT_SYMBOL(sbc_get_device_rev); - u32 sbc_get_device_type(struct se_device *dev) { return TYPE_DISK; diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c index 7ecac453b11a..71d440f0573e 100644 --- a/drivers/target/target_core_spc.c +++ b/drivers/target/target_core_spc.c @@ -78,7 +78,7 @@ static int spc_emulate_inquiry_std(struct se_cmd *cmd, char *buf) if (dev->transport->get_device_type(dev) == TYPE_TAPE) buf[1] = 0x80; - buf[2] = dev->transport->get_device_rev(dev); + buf[2] = 0x05; /* SPC-3 */ /* * NORMACA and HISUP = 0, RESPONSE DATA FORMAT = 2 |
