---

yaml --- r: 344729 b: refs/heads/master c: 48c2567 h: refs/heads/master i: 344727: c16cdca v: v3
git-mirror · Nov 7, 2012 · e8810be · e8810be
1 parent 4df5f66
commit e8810be
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 27 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c87fbd5656f263f0fc1c37d20f402797c068232e
+refs/heads/master: 48c2567d1a10b5a2cab72b37775b886b08f88726
diff --git a/trunk/drivers/target/target_core_device.c b/trunk/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/trunk/drivers/target/target_core_file.c b/trunk/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/trunk/drivers/target/target_core_iblock.c b/trunk/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/trunk/drivers/target/target_core_pscsi.c b/trunk/drivers/target/target_core_pscsi.c
@@ -1106,18 +1106,6 @@ static int pscsi_execute_cmd(struct se_cmd *cmd)
 	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/trunk/drivers/target/target_core_rd.c b/trunk/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/trunk/drivers/target/target_core_sbc.c b/trunk/drivers/target/target_core_sbc.c
@@ -604,12 +604,6 @@ int sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
 }
 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/trunk/drivers/target/target_core_spc.c b/trunk/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

diff --git a/trunk/include/target/target_core_backend.h b/trunk/include/target/target_core_backend.h
@@ -32,7 +32,6 @@ struct se_subsystem_api {
 				   unsigned char *);
 
 	int (*parse_cdb)(struct se_cmd *cmd);
-	u32 (*get_device_rev)(struct se_device *);
 	u32 (*get_device_type)(struct se_device *);
 	sector_t (*get_blocks)(struct se_device *);
 	unsigned char *(*get_sense_buffer)(struct se_cmd *);