diff options
| author | Christoph Hellwig <hch@infradead.org> | 2012-10-10 17:37:17 -0400 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-11-06 23:55:45 -0500 |
| commit | 48c2567d1a10b5a2cab72b37775b886b08f88726 (patch) | |
| tree | 0d30560ee9db1e06cca6ed0111036a713850bae6 /drivers/target | |
| parent | c87fbd5656f263f0fc1c37d20f402797c068232e (diff) | |
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>
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 3c3a3019ce7..066e8159afc 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) | |||
| 1348 | 1348 | ||
| 1349 | device_type = dev->transport->get_device_type(dev); | 1349 | device_type = dev->transport->get_device_type(dev); |
| 1350 | pr_debug(" Type: %s ", scsi_device_type(device_type)); | 1350 | pr_debug(" Type: %s ", scsi_device_type(device_type)); |
| 1351 | pr_debug(" ANSI SCSI revision: %02x\n", | ||
| 1352 | dev->transport->get_device_rev(dev)); | ||
| 1353 | } | 1351 | } |
| 1354 | 1352 | ||
| 1355 | struct se_device *target_alloc_device(struct se_hba *hba, const char *name) | 1353 | 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 2a3e2bbd807..342a6a6dcca 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 = { | |||
| 534 | .parse_cdb = fd_parse_cdb, | 534 | .parse_cdb = fd_parse_cdb, |
| 535 | .set_configfs_dev_params = fd_set_configfs_dev_params, | 535 | .set_configfs_dev_params = fd_set_configfs_dev_params, |
| 536 | .show_configfs_dev_params = fd_show_configfs_dev_params, | 536 | .show_configfs_dev_params = fd_show_configfs_dev_params, |
| 537 | .get_device_rev = sbc_get_device_rev, | ||
| 538 | .get_device_type = sbc_get_device_type, | 537 | .get_device_type = sbc_get_device_type, |
| 539 | .get_blocks = fd_get_blocks, | 538 | .get_blocks = fd_get_blocks, |
| 540 | }; | 539 | }; |
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 701877f9cd3..17fc01d6bae 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 = { | |||
| 725 | .parse_cdb = iblock_parse_cdb, | 725 | .parse_cdb = iblock_parse_cdb, |
| 726 | .set_configfs_dev_params = iblock_set_configfs_dev_params, | 726 | .set_configfs_dev_params = iblock_set_configfs_dev_params, |
| 727 | .show_configfs_dev_params = iblock_show_configfs_dev_params, | 727 | .show_configfs_dev_params = iblock_show_configfs_dev_params, |
| 728 | .get_device_rev = sbc_get_device_rev, | ||
| 729 | .get_device_type = sbc_get_device_type, | 728 | .get_device_type = sbc_get_device_type, |
| 730 | .get_blocks = iblock_get_blocks, | 729 | .get_blocks = iblock_get_blocks, |
| 731 | }; | 730 | }; |
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index dd6ac7c380c..aa3e80a2f8d 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c | |||
| @@ -1106,18 +1106,6 @@ fail: | |||
| 1106 | return -ENOMEM; | 1106 | return -ENOMEM; |
| 1107 | } | 1107 | } |
| 1108 | 1108 | ||
| 1109 | /* pscsi_get_device_rev(): | ||
| 1110 | * | ||
| 1111 | * | ||
| 1112 | */ | ||
| 1113 | static u32 pscsi_get_device_rev(struct se_device *dev) | ||
| 1114 | { | ||
| 1115 | struct pscsi_dev_virt *pdv = PSCSI_DEV(dev); | ||
| 1116 | struct scsi_device *sd = pdv->pdv_sd; | ||
| 1117 | |||
| 1118 | return (sd->scsi_level - 1) ? sd->scsi_level - 1 : 1; | ||
| 1119 | } | ||
| 1120 | |||
| 1121 | /* pscsi_get_device_type(): | 1109 | /* pscsi_get_device_type(): |
| 1122 | * | 1110 | * |
| 1123 | * | 1111 | * |
| @@ -1187,7 +1175,6 @@ static struct se_subsystem_api pscsi_template = { | |||
| 1187 | .parse_cdb = pscsi_parse_cdb, | 1175 | .parse_cdb = pscsi_parse_cdb, |
| 1188 | .set_configfs_dev_params = pscsi_set_configfs_dev_params, | 1176 | .set_configfs_dev_params = pscsi_set_configfs_dev_params, |
| 1189 | .show_configfs_dev_params = pscsi_show_configfs_dev_params, | 1177 | .show_configfs_dev_params = pscsi_show_configfs_dev_params, |
| 1190 | .get_device_rev = pscsi_get_device_rev, | ||
| 1191 | .get_device_type = pscsi_get_device_type, | 1178 | .get_device_type = pscsi_get_device_type, |
| 1192 | .get_blocks = pscsi_get_blocks, | 1179 | .get_blocks = pscsi_get_blocks, |
| 1193 | }; | 1180 | }; |
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c index 6348b667252..92b1307a993 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 = { | |||
| 449 | .parse_cdb = rd_parse_cdb, | 449 | .parse_cdb = rd_parse_cdb, |
| 450 | .set_configfs_dev_params = rd_set_configfs_dev_params, | 450 | .set_configfs_dev_params = rd_set_configfs_dev_params, |
| 451 | .show_configfs_dev_params = rd_show_configfs_dev_params, | 451 | .show_configfs_dev_params = rd_show_configfs_dev_params, |
| 452 | .get_device_rev = sbc_get_device_rev, | ||
| 453 | .get_device_type = sbc_get_device_type, | 452 | .get_device_type = sbc_get_device_type, |
| 454 | .get_blocks = rd_get_blocks, | 453 | .get_blocks = rd_get_blocks, |
| 455 | }; | 454 | }; |
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c index 01686954cfa..a4eb9c55365 100644 --- a/drivers/target/target_core_sbc.c +++ b/drivers/target/target_core_sbc.c | |||
| @@ -604,12 +604,6 @@ out_invalid_cdb_field: | |||
| 604 | } | 604 | } |
| 605 | EXPORT_SYMBOL(sbc_parse_cdb); | 605 | EXPORT_SYMBOL(sbc_parse_cdb); |
| 606 | 606 | ||
| 607 | u32 sbc_get_device_rev(struct se_device *dev) | ||
| 608 | { | ||
| 609 | return SCSI_SPC_2; /* Returns SPC-3 in Initiator Data */ | ||
| 610 | } | ||
| 611 | EXPORT_SYMBOL(sbc_get_device_rev); | ||
| 612 | |||
| 613 | u32 sbc_get_device_type(struct se_device *dev) | 607 | u32 sbc_get_device_type(struct se_device *dev) |
| 614 | { | 608 | { |
| 615 | return TYPE_DISK; | 609 | return TYPE_DISK; |
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c index 7ecac453b11..71d440f0573 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) | |||
| 78 | if (dev->transport->get_device_type(dev) == TYPE_TAPE) | 78 | if (dev->transport->get_device_type(dev) == TYPE_TAPE) |
| 79 | buf[1] = 0x80; | 79 | buf[1] = 0x80; |
| 80 | 80 | ||
| 81 | buf[2] = dev->transport->get_device_rev(dev); | 81 | buf[2] = 0x05; /* SPC-3 */ |
| 82 | 82 | ||
| 83 | /* | 83 | /* |
| 84 | * NORMACA and HISUP = 0, RESPONSE DATA FORMAT = 2 | 84 | * NORMACA and HISUP = 0, RESPONSE DATA FORMAT = 2 |
