aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-11-02 15:16:08 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-12-07 16:52:41 -0500
commit9117c6dc430578748ce732c6ff25eed8ed501a97 (patch)
treebf979269fb81674bf94bf14ea6a97152943024dc
parent28b066795f26196003353e1b4f7beaf63158ee74 (diff)
ieee1394: sbp2: remove unused struct members
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/ieee1394/sbp2.c23
-rw-r--r--drivers/ieee1394/sbp2.h6
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,
1288 struct csr1212_keyval *kv; 1288 struct csr1212_keyval *kv;
1289 struct csr1212_dentry *dentry; 1289 struct csr1212_dentry *dentry;
1290 u64 management_agent_addr; 1290 u64 management_agent_addr;
1291 u32 command_set_spec_id, command_set, unit_characteristics, 1291 u32 unit_characteristics, firmware_revision;
1292 firmware_revision;
1293 unsigned workarounds; 1292 unsigned workarounds;
1294 int i; 1293 int i;
1295 1294
1296 management_agent_addr = 0x0; 1295 management_agent_addr = 0;
1297 command_set_spec_id = 0x0; 1296 unit_characteristics = 0;
1298 command_set = 0x0; 1297 firmware_revision = 0;
1299 unit_characteristics = 0x0;
1300 firmware_revision = 0x0;
1301 1298
1302 csr1212_for_each_dir_entry(ud->ne->csr, kv, ud->ud_kv, dentry) { 1299 csr1212_for_each_dir_entry(ud->ne->csr, kv, ud->ud_kv, dentry) {
1303 switch (kv->key.id) { 1300 switch (kv->key.id) {
@@ -1312,14 +1309,6 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,
1312 ORB_SET_LUN(kv->value.immediate); 1309 ORB_SET_LUN(kv->value.immediate);
1313 break; 1310 break;
1314 1311
1315 case SBP2_COMMAND_SET_SPEC_ID_KEY:
1316 command_set_spec_id = kv->value.immediate;
1317 break;
1318
1319 case SBP2_COMMAND_SET_KEY:
1320 command_set = kv->value.immediate;
1321 break;
1322
1323 case SBP2_UNIT_CHARACTERISTICS_KEY: 1312 case SBP2_UNIT_CHARACTERISTICS_KEY:
1324 /* FIXME: This is ignored so far. 1313 /* FIXME: This is ignored so far.
1325 * See SBP-2 clause 7.4.8. */ 1314 * See SBP-2 clause 7.4.8. */
@@ -1380,10 +1369,6 @@ static void sbp2_parse_unit_directory(struct scsi_id_instance_data *scsi_id,
1380 sbp2_parse_unit_directory(scsi_id, parent_ud); 1369 sbp2_parse_unit_directory(scsi_id, parent_ud);
1381 } else { 1370 } else {
1382 scsi_id->management_agent_addr = management_agent_addr; 1371 scsi_id->management_agent_addr = management_agent_addr;
1383 scsi_id->command_set_spec_id = command_set_spec_id;
1384 scsi_id->command_set = command_set;
1385 scsi_id->unit_characteristics = unit_characteristics;
1386 scsi_id->firmware_revision = firmware_revision;
1387 scsi_id->workarounds = workarounds; 1372 scsi_id->workarounds = workarounds;
1388 if (ud->flags & UNIT_DIRECTORY_HAS_LUN) 1373 if (ud->flags & UNIT_DIRECTORY_HAS_LUN)
1389 scsi_id->lun = ORB_SET_LUN(ud->lun); 1374 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 {
295 u64 command_block_agent_addr; 295 u64 command_block_agent_addr;
296 u32 speed_code; 296 u32 speed_code;
297 u32 max_payload_size; 297 u32 max_payload_size;
298
299 /* Pulled from the device's unit directory */
300 u32 command_set_spec_id;
301 u32 command_set;
302 u32 unit_characteristics;
303 u32 firmware_revision;
304 u16 lun; 298 u16 lun;
305 299
306 /* Address for the unit to write status blocks to */ 300 /* Address for the unit to write status blocks to */