evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ieee1394: sbp2: remove unused struct members

Browse source 
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2006-11-02 21:16:08 +01:00
parent 28b066795f
commit 9117c6dc43
2 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/ieee1394/sbp2.c
View file

@ -1288,16 +1288,13 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,
struct csr1212_keyval *kv; struct csr1212_keyval *kv;
struct csr1212_dentry *dentry; struct csr1212_dentry *dentry;
u64 management_agent_addr; u64 management_agent_addr;
u32 command_set_spec_id, command_set, unit_characteristics, u32 unit_characteristics, firmware_revision;
firmware_revision;
unsigned workarounds; unsigned workarounds;
int i; int i;
management_agent_addr = 0x0; management_agent_addr = 0;
command_set_spec_id = 0x0; unit_characteristics = 0;
command_set = 0x0; firmware_revision = 0;
unit_characteristics = 0x0;
firmware_revision = 0x0;
csr1212_for_each_dir_entry(ud->ne->csr, kv, ud->ud_kv, dentry) { csr1212_for_each_dir_entry(ud->ne->csr, kv, ud->ud_kv, dentry) {
switch (kv->key.id) { 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); ORB_SET_LUN(kv->value.immediate);
break; 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: case SBP2_UNIT_CHARACTERISTICS_KEY:
/* FIXME: This is ignored so far. /* FIXME: This is ignored so far.
* See SBP-2 clause 7.4.8. */ * 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); sbp2_parse_unit_directory(scsi_id, parent_ud);
} else { } else {
scsi_id->management_agent_addr = management_agent_addr; 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; scsi_id->workarounds = workarounds;
if (ud->flags & UNIT_DIRECTORY_HAS_LUN) if (ud->flags & UNIT_DIRECTORY_HAS_LUN)
scsi_id->lun = ORB_SET_LUN(ud->lun); scsi_id->lun = ORB_SET_LUN(ud->lun);

6
drivers/ieee1394/sbp2.h
View file

@ -295,12 +295,6 @@ struct scsi_id_instance_data {
u64 command_block_agent_addr; u64 command_block_agent_addr;
u32 speed_code; u32 speed_code;
u32 max_payload_size; 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; u16 lun;
/* Address for the unit to write status blocks to */ /* Address for the unit to write status blocks to */