ieee1394: remove unused variables

which caused gcc 4.6 to warn about
    variable 'XYZ' set but not used.

sbp2.c, unit_characteristics:

The underlying problem which was spotted here --- an incomplete
implementation --- is already 50% fixed in drivers/firewire/sbp2.c which
observes mgt_ORB_timeout but not yet ORB_size.

raw1394.c, length_conflict; dv1394.c, ts_off:

Impossible to tell why these variables are there.  We can safely remove
them though because we don't need a compiler warning to realize that we
are dealing with (at least stylistically) flawed code here.

dv1394.c, packet_time:

This was used in debug macro that is only compiled in with
DV1394_DEBUG_LEVEL >= 2 defined at compile-time.  Just drop it since
nobody debugs dv1394 anymore.  Avoids noise in regular kernel builds.

dv1394.c, ohci; eth1394.c, priv:

These variables clearly can go away.  Somebody wanted to use them but
then didn't (or not anymore).

Note, all of this code is considered to be at its end of life and is
thus not really meant to receive janitorial updates anymore.  But if we
can easily remove noisy warnings from kernel builds, we should.

Reported-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index f199896c4113..d3a136c70c48 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1351,12 +1351,11 @@ static void sbp2_parse_unit_directory(struct sbp2_lu *lu,
         struct csr1212_keyval *kv;
         struct csr1212_dentry *dentry;
         u64 management_agent_addr;
-        u32 unit_characteristics, firmware_revision, model;
+        u32 firmware_revision, model;
         unsigned workarounds;
         int i;
 
         management_agent_addr = 0;
-        unit_characteristics = 0;
         firmware_revision = SBP2_ROM_VALUE_MISSING;
         model = ud->flags & UNIT_DIRECTORY_MODEL_ID ?
                                 ud->model_id : SBP2_ROM_VALUE_MISSING;
@@ -1373,17 +1372,15 @@ static void sbp2_parse_unit_directory(struct sbp2_lu *lu,
                                 lu->lun = ORB_SET_LUN(kv->value.immediate);
                         break;
 
-                case SBP2_UNIT_CHARACTERISTICS_KEY:
-                        /* FIXME: This is ignored so far.
-                         * See SBP-2 clause 7.4.8. */
-                        unit_characteristics = kv->value.immediate;
-                        break;
 
                 case SBP2_FIRMWARE_REVISION_KEY:
                         firmware_revision = kv->value.immediate;
                         break;
 
                 default:
+                        /* FIXME: Check for SBP2_UNIT_CHARACTERISTICS_KEY
+                         * mgt_ORB_timeout and ORB_size, SBP-2 clause 7.4.8. */
+
                         /* FIXME: Check for SBP2_DEVICE_TYPE_AND_LUN_KEY.
                          * Its "ordered" bit has consequences for command ORB
                          * list handling. See SBP-2 clauses 4.6, 7.4.11, 10.2 */