[Linux1394-cvslog] rev 513 - trunk

[SVN U. <ben...@us...>]

Author: bencollins
Date: Sat, 13 Jul 2002 21:35:55 -0400
New Revision: 513

Modified:
   trunk/ieee1394_transactions.c
   trunk/nodemgr.c
   trunk/sbp2.h
Log:
Fix various compiler warnings

Modified: trunk/ieee1394_transactions.c
==============================================================================
--- trunk/ieee1394_transactions.c	(original)
+++ trunk/ieee1394_transactions.c	Mon Jul 15 12:35:23 2002
@@ -169,7 +169,7 @@
  */
 int get_tlabel(struct hpsb_host *host, nodeid_t nodeid, int wait)
 {
-	int tlabel;
+	int tlabel = 0;
 	unsigned long flags;
 	int found_tlabel = 0;
 

Modified: trunk/nodemgr.c
==============================================================================
--- trunk/nodemgr.c	(original)
+++ trunk/nodemgr.c	Mon Jul 15 12:35:24 2002
@@ -999,13 +999,12 @@
 				 NODE_BUS_FMT, NODE_BUS_ARGS(nodeid));
 			return -1;
 		}
-		if (buffer[0]) {
+		if (buffer[0])
 			break;
-		} else {
-			set_current_state(TASK_INTERRUPTIBLE);
-			if (schedule_timeout (HZ/4))
-				return;
-		}
+
+		set_current_state(TASK_INTERRUPTIBLE);
+		if (schedule_timeout (HZ/4))
+			return -1;
 	}
 
 	header_size = buffer[0] >> 24;

Modified: trunk/sbp2.h
==============================================================================
--- trunk/sbp2.h	(original)
+++ trunk/sbp2.h	Mon Jul 15 12:35:25 2002
@@ -500,10 +500,13 @@
 			     struct unit_directory *ud);
 static void sbp2_remove_device(struct sbp2scsi_host_info *hi, 
 			       struct scsi_id_instance_data *scsi_id);
+
+#ifdef CONFIG_IEEE1394_SBP2_PHYS_DMA
 static int sbp2_handle_physdma_write(struct hpsb_host *host, int nodeid, int destid, quadlet_t *data,
                                      u64 addr, unsigned int length);
 static int sbp2_handle_physdma_read(struct hpsb_host *host, int nodeid, quadlet_t *data,
                                     u64 addr, unsigned int length);
+#endif
 
 /*
  * SBP-2 protocol related prototypes