Commit 48c2567d1a10b5a2cab72b37775b886b08f88726
Committed by
Nicholas Bellinger
Nicholas Bellinger
1 parent
c87fbd5656
Exists in
master
and in
20 other branches
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>
Showing 8 changed files with 1 additions and 26 deletions Side-by-side Diff
drivers/target/target_core_device.c
| ... | ... | @@ -1348,8 +1348,6 @@ |
| 1348 | 1348 | |
| 1349 | 1349 | device_type = dev->transport->get_device_type(dev); |
| 1350 | 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 | 1353 | struct se_device *target_alloc_device(struct se_hba *hba, const char *name) |
drivers/target/target_core_file.c
| ... | ... | @@ -534,7 +534,6 @@ |
| 534 | 534 | .parse_cdb = fd_parse_cdb, |
| 535 | 535 | .set_configfs_dev_params = fd_set_configfs_dev_params, |
| 536 | 536 | .show_configfs_dev_params = fd_show_configfs_dev_params, |
| 537 | - .get_device_rev = sbc_get_device_rev, | |
| 538 | 537 | .get_device_type = sbc_get_device_type, |
| 539 | 538 | .get_blocks = fd_get_blocks, |
| 540 | 539 | }; |
drivers/target/target_core_iblock.c
| ... | ... | @@ -725,7 +725,6 @@ |
| 725 | 725 | .parse_cdb = iblock_parse_cdb, |
| 726 | 726 | .set_configfs_dev_params = iblock_set_configfs_dev_params, |
| 727 | 727 | .show_configfs_dev_params = iblock_show_configfs_dev_params, |
| 728 | - .get_device_rev = sbc_get_device_rev, | |
| 729 | 728 | .get_device_type = sbc_get_device_type, |
| 730 | 729 | .get_blocks = iblock_get_blocks, |
| 731 | 730 | }; |
drivers/target/target_core_pscsi.c
| ... | ... | @@ -1106,18 +1106,6 @@ |
| 1106 | 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 | 1109 | /* pscsi_get_device_type(): |
| 1122 | 1110 | * |
| 1123 | 1111 | * |
| ... | ... | @@ -1187,7 +1175,6 @@ |
| 1187 | 1175 | .parse_cdb = pscsi_parse_cdb, |
| 1188 | 1176 | .set_configfs_dev_params = pscsi_set_configfs_dev_params, |
| 1189 | 1177 | .show_configfs_dev_params = pscsi_show_configfs_dev_params, |
| 1190 | - .get_device_rev = pscsi_get_device_rev, | |
| 1191 | 1178 | .get_device_type = pscsi_get_device_type, |
| 1192 | 1179 | .get_blocks = pscsi_get_blocks, |
| 1193 | 1180 | }; |
drivers/target/target_core_rd.c
| ... | ... | @@ -449,7 +449,6 @@ |
| 449 | 449 | .parse_cdb = rd_parse_cdb, |
| 450 | 450 | .set_configfs_dev_params = rd_set_configfs_dev_params, |
| 451 | 451 | .show_configfs_dev_params = rd_show_configfs_dev_params, |
| 452 | - .get_device_rev = sbc_get_device_rev, | |
| 453 | 452 | .get_device_type = sbc_get_device_type, |
| 454 | 453 | .get_blocks = rd_get_blocks, |
| 455 | 454 | }; |
drivers/target/target_core_sbc.c
| ... | ... | @@ -604,12 +604,6 @@ |
| 604 | 604 | } |
| 605 | 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 | 607 | u32 sbc_get_device_type(struct se_device *dev) |
| 614 | 608 | { |
| 615 | 609 | return TYPE_DISK; |
drivers/target/target_core_spc.c
include/target/target_core_backend.h
| ... | ... | @@ -32,7 +32,6 @@ |
| 32 | 32 | unsigned char *); |
| 33 | 33 | |
| 34 | 34 | int (*parse_cdb)(struct se_cmd *cmd); |
| 35 | - u32 (*get_device_rev)(struct se_device *); | |
| 36 | 35 | u32 (*get_device_type)(struct se_device *); |
| 37 | 36 | sector_t (*get_blocks)(struct se_device *); |
| 38 | 37 | unsigned char *(*get_sense_buffer)(struct se_cmd *); |