[Linux1394-cvslog] rev 800 - trunk

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

Author: bencollins
Date: 2003-02-26 01:46:26 -0500 (Wed, 26 Feb 2003)
New Revision: 800

Modified:
   trunk/amdtp.c
   trunk/dv1394-private.h
   trunk/eth1394.c
   trunk/ohci1394.c
   trunk/ohci1394.h
   trunk/raw1394.c
Log:
English Teacher meets Programmer. More spelling fixes merged from Linus'
tree.


Modified: trunk/ohci1394.c
==============================================================================
--- trunk/ohci1394.c	(original)
+++ trunk/ohci1394.c	2003-02-26 01:46:27.000000000 -0500
@@ -827,7 +827,7 @@
 		return 0;
 	}
 
-	/* Decide wether we have an iso, a request, or a response packet */
+	/* Decide whether we have an iso, a request, or a response packet */
 	if (packet->type == hpsb_raw)
 		d = &ohci->at_req_context;
 	else if (packet->tcode == TCODE_ISO_DATA) {
@@ -2266,7 +2266,7 @@
 	if (event & OHCI1394_cycleInconsistent) {
 		/* We subscribe to the cycleInconsistent event only to
 		 * clear the corresponding event bit... otherwise,
-		 * isochronous cycleMatch DMA wont work. */
+		 * isochronous cycleMatch DMA won't work. */
 		DBGMSG(ohci->id, "OHCI1394_cycleInconsistent");
 		event &= ~OHCI1394_cycleInconsistent;
 	}
@@ -2366,7 +2366,7 @@
 			if (!(node_id & 0x80000000)) {
 				PRINT(KERN_ERR, ohci->id,
 				      "SelfID received, but NodeID invalid "
-				      "(probably new bus reset occured): %08X",
+				      "(probably new bus reset occurred): %08X",
 				      node_id);
 				goto selfid_not_valid;
 			}
@@ -3530,7 +3530,7 @@
 	tasklet_init(&tasklet->tasklet, func, data);
 	tasklet->type = type;
 	/* We init the tasklet->link field, so we can list_del() it
-	 * without worrying wether it was added to the list or not. */
+	 * without worrying whether it was added to the list or not. */
 	INIT_LIST_HEAD(&tasklet->link);
 }
 

Modified: trunk/amdtp.c
==============================================================================
--- trunk/amdtp.c	(original)
+++ trunk/amdtp.c	2003-02-26 01:46:27.000000000 -0500
@@ -230,7 +230,7 @@
 	/* The cycle_count and cycle_offset fields are used for the
 	 * synchronization timestamps (syt) in the cip header.  They
 	 * are incremented by at least a cycle every time we put a
-	 * time stamp in a packet.  As we dont time stamp all
+	 * time stamp in a packet.  As we don't time stamp all
 	 * packages, cycle_count isn't updated in every cycle, and
 	 * sometimes it's incremented by 2.  Thus, we have
 	 * cycle_count2, which is simply incremented by one with each
@@ -750,7 +750,7 @@
 
 		/* This next addition should be modulo 8000 (0x1f40),
 		 * but we only use the lower 4 bits of cycle_count, so
-		 * we dont need the modulo. */
+		 * we don't need the modulo. */
 		atomic_add(s->cycle_offset.integer / 3072, &s->cycle_count);
 		s->cycle_offset.integer %= 3072;
 	}

Modified: trunk/dv1394-private.h
==============================================================================
--- trunk/dv1394-private.h	(original)
+++ trunk/dv1394-private.h	2003-02-26 01:46:27.000000000 -0500
@@ -488,7 +488,7 @@
 	struct frame *frames[DV1394_MAX_FRAMES];
 	
 	/* n_frames also serves as an indicator that this struct video_card is
-	   intialized and ready to run DMA buffers */
+	   initialized and ready to run DMA buffers */
 
 	int n_frames;
 

Modified: trunk/ohci1394.h
==============================================================================
--- trunk/ohci1394.h	(original)
+++ trunk/ohci1394.h	2003-02-26 01:46:27.000000000 -0500
@@ -405,12 +405,12 @@
 					   truncated */
 #define EVT_OVERRUN		0x5	/* A recv FIFO overflowed on reception of ISO
 					   packet */
-#define EVT_DESCRIPTOR_READ	0x6	/* An unrecoverable error occured while host was
+#define EVT_DESCRIPTOR_READ	0x6	/* An unrecoverable error occurred while host was
 					   reading a descriptor block */
-#define EVT_DATA_READ		0x7	/* An error occured while host controller was
+#define EVT_DATA_READ		0x7	/* An error occurred while host controller was
 					   attempting to read from host memory in the data
 					   stage of descriptor processing */
-#define EVT_DATA_WRITE		0x8	/* An error occured while host controller was
+#define EVT_DATA_WRITE		0x8	/* An error occurred while host controller was
 					   attempting to write either during the data stage
 					   of descriptor processing, or when processing a single
 					   16-bit host memory write */

Modified: trunk/raw1394.c
==============================================================================
--- trunk/raw1394.c	(original)
+++ trunk/raw1394.c	2003-02-26 01:46:27.000000000 -0500
@@ -2439,7 +2439,7 @@
         spin_unlock_irq(&host_info_lock);
         if (fail > 0) {
                 printk(KERN_ERR "raw1394: during addr_list-release "
-                        "error(s) occured \n");
+                        "error(s) occurred \n");
         }
 
         while (!done) {

Modified: trunk/eth1394.c
==============================================================================
--- trunk/eth1394.c	(original)
+++ trunk/eth1394.c	2003-02-26 01:46:28.000000000 -0500
@@ -663,7 +663,7 @@
 	 * call to schedule our writes.  */
 
 	/* XXX: Right now we accept that we don't exactly follow RFC. When
-	 * we do, we will send ARP requests via GASP format, and so we wont
+	 * we do, we will send ARP requests via GASP format, and so we won't
 	 * need this hack.  */
 
 	spin_lock_irqsave (&priv->lock, flags);