target: remove ->get_device_rev

Now that the reservations and ALUA code have been cleaned up there is no need
for the get_device_rev method, as we only need the standards revision in the
inquiry data, where we can hardcode it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 3c3a3019ce7ba5283861e29e77f36a0bfca43be6..066e8159afcddb59da08c4cfbb1a6488c2bc4734 100644 (file)
--- 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 2a3e2bbd8078ca937f7c0d498e0138250ac19e09..342a6a6dcca03168bfcfd85e2dd6d3de9f5a7a1d 100644 (file)
--- 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 701877f9cd33ebd62f5375b120364abd6b41466a..17fc01d6baea68128a3019abe9a653c322a578cc 100644 (file)
--- 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 dd6ac7c380c9cbb227c1d6a64d8f7c3933f7b56e..aa3e80a2f8dbaed6db45a18dc5742e8f41913b75 100644 (file)
--- 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 6348b6672526b72b94a99132bbf4169541b7412b..92b1307a993159c544cd5be980c44521ffb4b971 100644 (file)
--- 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 01686954cfa0e1d32c451abd5192fbbf3d47dee2..a4eb9c5536548d1bdf0bb29d42f98519de24ec22 100644 (file)
--- 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 7ecac453b11a27aa40f59ad76e3fadee1bd0a25f..71d440f0573e0bb9c1264241b45e5be862a04e95 100644 (file)
--- 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

diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index b7f3936453e1058eb3e79eebf5ac9d55422331fa..e57f738f04f9d1ff1ac4034c017e537b8c941341 100644 (file)
--- a/include/target/target_core_backend.h
+++ b/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 *);