diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-11-02 21:16:08 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-12-07 22:52:41 +0100 |
| commit | 9117c6dc430578748ce732c6ff25eed8ed501a97 (patch) | |
| tree | bf979269fb81674bf94bf14ea6a97152943024dc | |
| parent | 28b066795f26196003353e1b4f7beaf63158ee74 (diff) | |
| download | linux-9117c6dc430578748ce732c6ff25eed8ed501a97.tar.bz2 | |
ieee1394: sbp2: remove unused struct members
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 23 | ||||
| -rw-r--r-- | drivers/ieee1394/sbp2.h | 6 |
2 files changed, 4 insertions, 25 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index c9263771d181..34280c7eb73d 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -1288,16 +1288,13 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id, struct csr1212_keyval *kv; struct csr1212_dentry *dentry; u64 management_agent_addr; - u32 command_set_spec_id, command_set, unit_characteristics, - firmware_revision; + u32 unit_characteristics, firmware_revision; unsigned workarounds; int i; - management_agent_addr = 0x0; - command_set_spec_id = 0x0; - command_set = 0x0; - unit_characteristics = 0x0; - firmware_revision = 0x0; + management_agent_addr = 0; + unit_characteristics = 0; + firmware_revision = 0; csr1212_for_each_dir_entry(ud->ne->csr, kv, ud->ud_kv, dentry) { switch (kv->key.id) { @@ -1312,14 +1309,6 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id, ORB_SET_LUN(kv->value.immediate); break; - case SBP2_COMMAND_SET_SPEC_ID_KEY: - command_set_spec_id = kv->value.immediate; - break; - - case SBP2_COMMAND_SET_KEY: - command_set = kv->value.immediate; - break; - case SBP2_UNIT_CHARACTERISTICS_KEY: /* FIXME: This is ignored so far. * See SBP-2 clause 7.4.8. */ @@ -1380,10 +1369,6 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id, sbp2_parse_unit_directory(scsi_id, parent_ud); } else { scsi_id->management_agent_addr = management_agent_addr; - scsi_id->command_set_spec_id = command_set_spec_id; - scsi_id->command_set = command_set; - scsi_id->unit_characteristics = unit_characteristics; - scsi_id->firmware_revision = firmware_revision; scsi_id->workarounds = workarounds; if (ud->flags & UNIT_DIRECTORY_HAS_LUN) scsi_id->lun = ORB_SET_LUN(ud->lun); diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h index 6c1f8ff1c59e..8902a4676959 100644 --- a/drivers/ieee1394/sbp2.h +++ b/drivers/ieee1394/sbp2.h @@ -295,12 +295,6 @@ struct scsi_id_instance_data { u64 command_block_agent_addr; u32 speed_code; u32 max_payload_size; - - /* Pulled from the device's unit directory */ - u32 command_set_spec_id; - u32 command_set; - u32 unit_characteristics; - u32 firmware_revision; u16 lun; /* Address for the unit to write status blocks to */ |