From 29dc026bca6c1a1eae2b4f3a620ebaf91ad361e5 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Thu, 2 Nov 2006 21:16:08 +0100
Subject: [PATCH] --- yaml --- r: 43455 b: refs/heads/master c:
 9117c6dc430578748ce732c6ff25eed8ed501a97 h: refs/heads/master i:   43453:
 e98adab8f5a704401ff3a4f7fd4ca4439c7652ef   43451:
 2a2e09f62f3b36b83c2be9819255b1f81c0d7099   43447:
 308997631090128415d538b981fd6481ec578e96   43439:
 383c149e35d8ef759d46a97ea2d683ff356b89a9   43423:
 2320b56683ddf1d3f37e3c57407333c061ea3ff0   43391:
 c5b2420ca7d1efe65d9674b9a81af94b1d244218 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/ieee1394/sbp2.c | 23 ++++-------------------
 trunk/drivers/ieee1394/sbp2.h |  6 ------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 21482bef64ec..7529dca62de9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28b066795f26196003353e1b4f7beaf63158ee74
+refs/heads/master: 9117c6dc430578748ce732c6ff25eed8ed501a97
diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c
index c9263771d181..34280c7eb73d 100644
--- a/trunk/drivers/ieee1394/sbp2.c
+++ b/trunk/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/trunk/drivers/ieee1394/sbp2.h b/trunk/drivers/ieee1394/sbp2.h
index 6c1f8ff1c59e..8902a4676959 100644
--- a/trunk/drivers/ieee1394/sbp2.h
+++ b/trunk/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 */