4 files changed, 7 insertions, 24 deletions

diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index adaefabc40e9..f8fcbd048447 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -610,7 +610,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
         } else {
 
                 u32 transmit_sec, transmit_cyc;
-                u32 ts_cyc, ts_off;
+                u32 ts_cyc;
 
                 /* DMA is stopped, so this is the very first frame */
                 video->active_frame = this_frame;
@@ -636,7 +636,6 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
                 transmit_sec += transmit_cyc/8000;
                 transmit_cyc %= 8000;
 
-                ts_off = ct_off;
                 ts_cyc = transmit_cyc + 3;
                 ts_cyc %= 8000;
 
@@ -2004,7 +2003,7 @@ static void ir_tasklet_func(unsigned long data)
 
                 int sof=0; /* start-of-frame flag */
                 struct frame *f;
-                u16 packet_length, packet_time;
+                u16 packet_length;
                 int i, dbc=0;
                 struct DMA_descriptor_block *block = NULL;
                 u16 xferstatus;
@@ -2024,11 +2023,6 @@ static void ir_tasklet_func(unsigned long data)
                                                 sizeof(struct packet));
 
                         packet_length = le16_to_cpu(p->data_length);
-                        packet_time   = le16_to_cpu(p->timestamp);
-
-                        irq_printk("received packet %02d, timestamp=%04x, length=%04x, sof=%02x%02x\n", video->current_packet,
-                                   packet_time, packet_length,
-                                   p->data[0], p->data[1]);
 
                         /* get the descriptor based on packet_buffer cursor */
                         f = video->frames[video->current_packet / MAX_PACKETS];
@@ -2320,7 +2314,6 @@ static void dv1394_add_host(struct hpsb_host *host)
 
 static void dv1394_host_reset(struct hpsb_host *host)
 {
-        struct ti_ohci *ohci;
         struct video_card *video = NULL, *tmp_vid;
         unsigned long flags;
 
@@ -2328,9 +2321,6 @@ static void dv1394_host_reset(struct hpsb_host *host)
         if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME))
                 return;
 
-        ohci = (struct ti_ohci *)host->hostdata;
-
-
         /* find the corresponding video_cards */
         spin_lock_irqsave(&dv1394_cards_lock, flags);
         list_for_each_entry(tmp_vid, &dv1394_cards, list) {
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index a4e9dcb6d4a9..bc289e367e30 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1258,7 +1258,6 @@ static void ether1394_iso(struct hpsb_iso *iso)
         char *buf;
         struct eth1394_host_info *hi;
         struct net_device *dev;
-        struct eth1394_priv *priv;
         unsigned int len;
         u32 specifier_id;
         u16 source_id;
@@ -1288,8 +1287,6 @@ static void ether1394_iso(struct hpsb_iso *iso)
                                (be32_to_cpu(data[1]) & 0xff000000) >> 24;
                 source_id = be32_to_cpu(data[0]) >> 16;
 
-                priv = netdev_priv(dev);
-
                 if (info->channel != (iso->host->csr.broadcast_channel & 0x3f)
                     || specifier_id != ETHER1394_GASP_SPECIFIER_ID) {
                         /* This packet is not for us */
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index b563d5e9fa2e..2c417ae7622b 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -1015,7 +1015,7 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
         struct arm_addr *arm_addr = NULL;
         struct arm_request *arm_req = NULL;
         struct arm_response *arm_resp = NULL;
-        int found = 0, size = 0, rcode = -1, length_conflict = 0;
+        int found = 0, size = 0, rcode = -1;
         struct arm_request_response *arm_req_resp = NULL;
 
         DBGMSG("arm_write called by node: %X "
@@ -1054,7 +1054,6 @@ static int arm_write(struct hpsb_host *host, int nodeid, int destid,
         }
         if (arm_addr->rec_length < length) {
                 DBGMSG("arm_write blocklength too big -> rcode_data_error");
-                length_conflict = 1;
                 rcode = RCODE_DATA_ERROR;       /* hardware error, data is unavailable */
         }
         if (rcode == -1) {
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 */