29 files changed, 44 insertions, 44 deletions
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 66bfe12..7027cc7 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -846,7 +846,7 @@ acpi_pci_link_set_bootdisabled_priority(void)
 	TAILQ_INIT(&sorted_list);
 	while (!TAILQ_EMPTY(&acpi_pci_link_entries)) {
 		link = TAILQ_FIRST(&acpi_pci_link_entries);
-		/* find a entry which have the highest priority. */
+		/* find an entry which has the highest priority. */
 		TAILQ_FOREACH(link_pri, &acpi_pci_link_entries, links) {
 			if (link->priority < link_pri->priority) {
 				link = link_pri;
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index f43a41f..b4dc58b 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -306,7 +306,7 @@ aha_probe(struct aha_softc* aha)
 
 	/*
 	 * Get the board ID.  We use this to see if we're dealing with
-	 * a buslogic card or a aha card (or clone).
+	 * a buslogic card or an aha card (or clone).
 	 */
 	error = aha_cmd(aha, AOP_INQUIRE_BOARD_ID, NULL, /*parmlen*/0,
 		       (u_int8_t*)&board_id, sizeof(board_id),
@@ -806,7 +806,7 @@ ahaaction(struct cam_sim *sim, union ccb *ccb)
 		struct	aha_hccb *hccb;
 
 		/*
-		 * get a accb to use.
+		 * Get an accb to use.
 		 */
 		if ((accb = ahagetccb(aha)) == NULL) {
 			int s;
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index 552d20e..fe5150a 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -31,7 +31,7 @@
 #define _IF_ARREGS_H_
 
 #define NCHAN			2    /* A HD64570 chip have 2 channels */
-#define NPORT			4    /* A ArNet board can have 4 ports or */
+#define NPORT			4    /* An ArNet board can have 4 ports or */
 				     /* channels */
 
 #define AR_BUF_SIZ		512
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index c9a2959..4e1c284 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -988,7 +988,7 @@ ASR_queue_s (
 } /* ASR_queue_s */
 
 /*
- *	Send a message synchronously to a Asr_softc_t
+ *	Send a message synchronously to an Asr_softc_t.
  */
 STATIC int
 ASR_queue_c (
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index ff2f589..a243c04 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -325,7 +325,7 @@ uSHORT		osdDestroySemaphore(SEMAPHORE_T);
 uLONG		osdRequestSemaphore(SEMAPHORE_T,uLONG);
   /* Release access to the specified mutually exclusive semaphore */
 uSHORT		osdReleaseSemaphore(SEMAPHORE_T);
-	/* wait for a event to happen */
+	/* wait for an event to happen */
 uLONG				 osdWaitForEventSemaphore(SEMAPHORE_T, uLONG);
 	/* signal an event */
 uLONG				 osdSignalEventSemaphore(SEMAPHORE_T);
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 88280d1..d186586 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -3417,7 +3417,7 @@ tulip_rx_intr(
 	     * those buffers and chain to the starting mbuf.  All buffers but
 	     * the last buffer have the same length so we can set that now.
 	     * (we add to last_offset instead of multiplying since we normally
-	     * won't go into the loop and thereby saving a ourselves from
+	     * won't go into the loop and thereby saving ourselves from
 	     * doing a multiplication by 0 in the normal case).
 	     */
 	    _IF_DEQUEUE(&sc->tulip_rxq, ms);
@@ -3918,7 +3918,7 @@ tulip_intr_handler(
 
 #if defined(TULIP_USE_SOFTINTR)
 /*
- * This is a experimental idea to alleviate problems due to interrupt
+ * This is an experimental idea to alleviate problems due to interrupt
  * livelock.  What is interrupt livelock?  It's when you spend all your
  * time servicing device interrupts and never drop below device ipl
  * to do "useful" work.
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 5ad04e3..8d1c849 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -936,7 +936,7 @@ ed_probe_Novell_generic(dev, flags)
 	/*
 	 * I don't know if this is necessary; probably cruft leftover from
 	 * Clarkson packet driver code. Doesn't do a thing on the boards I've
-	 * tested. -DG [note that a outb(0x84, 0) seems to work here, and is
+	 * tested. -DG [note that an outb(0x84, 0) seems to work here, and is
 	 * non-invasive...but some boards don't seem to reset and I don't have
 	 * complete documentation on what the 'right' thing to do is...so we
 	 * do the invasive thing for now. Yuck.]
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 307323f..c447530 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -754,7 +754,7 @@ ed98_probe_Novell(dev, port_rid, flags)
 	/*
 	 * I don't know if this is necessary; probably cruft leftover from
 	 * Clarkson packet driver code. Doesn't do a thing on the boards I've
-	 * tested. -DG [note that a outb(0x84, 0) seems to work here, and is
+	 * tested. -DG [note that an outb(0x84, 0) seems to work here, and is
 	 * non-invasive...but some boards don't seem to reset and I don't have
 	 * complete documentation on what the 'right' thing to do is...so we
 	 * do the invasive thing for now. Yuck.]
diff --git a/sys/dev/em/if_em_hw.h b/sys/dev/em/if_em_hw.h
index 9e6172d..6f1874c 100644
--- a/sys/dev/em/if_em_hw.h
+++ b/sys/dev/em/if_em_hw.h
@@ -280,7 +280,7 @@ void em_write_reg_io(struct em_hw *hw, uint32_t offset, uint32_t value);
 #define HALF_DUPLEX 1
 #define FULL_DUPLEX 2
 
-/* The sizes (in bytes) of a ethernet packet */
+/* The sizes (in bytes) of an ethernet packet */
 #define ENET_HEADER_SIZE             14
 #define MAXIMUM_ETHERNET_FRAME_SIZE  1518 /* With FCS */
 #define MINIMUM_ETHERNET_FRAME_SIZE  64   /* With FCS */
diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h
index e3fd644..0133458 100644
--- a/sys/dev/hea/eni.h
+++ b/sys/dev/hea/eni.h
@@ -365,7 +365,7 @@ typedef volatile struct vci_table VCI_Table;
 /*
  * Access to Serial EEPROM [as opposed to expansion (E)PROM].
  *
- * This is a ATMEL AT24C01 serial EEPROM part.
+ * This is an ATMEL AT24C01 serial EEPROM part.
  * See http://www.atmel.com/atmel/products/prod162.htm for timimg diagrams
  * for START/STOP/ACK/READ cycles.
  */
@@ -387,7 +387,7 @@ typedef volatile struct vci_table VCI_Table;
  * Device VCC Entry
  *
  * Contains the common and ENI-specific information for each VCC
- * which is opened through a ENI device.
+ * which is opened through an ENI device.
  */
 struct eni_vcc {
 	struct cmn_vcc	ev_cmn;		/* Common VCC stuff */
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index 9fc3cab..dd08b75 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -951,8 +951,8 @@ idt_connect_opencls(IDT * idt, CONNECTION * connection, int opflag)
  *    the DMA address.
  *
  *    returns -1 if queue is full, the address is not word aligned, or
- *    a invalid queue is specified
- *    returns 0 if parameters were acceptable
+ *    an invalid queue is specified.
+ *    returns 0 if parameters were acceptable.
  */
 
 int
diff --git a/sys/dev/idt/idtvar.h b/sys/dev/idt/idtvar.h
index 16e0c45..6761a00 100644
--- a/sys/dev/idt/idtvar.h
+++ b/sys/dev/idt/idtvar.h
@@ -196,7 +196,7 @@ typedef struct idt_softc IDT;
  * Device VCC Entry
  * 
  * Contains the common and IDT-specific information for each VCC
- * which is opened through a IDT device.
+ * which is opened through an IDT device.
  */
 struct nidt_vcc {
 	struct cmn_vcc iv_cmn;  /* Common VCC stuff */
diff --git a/sys/dev/isp/Hardware.txt b/sys/dev/isp/Hardware.txt
index dfdc0e7..75f01bf 100644
--- a/sys/dev/isp/Hardware.txt
+++ b/sys/dev/isp/Hardware.txt
@@ -147,7 +147,7 @@ JMR 4-Bay
 
 JMR Fortra
 
-	I rather like this box. The blue LEDs are a very nice touch- you 
+	I rather like this box. The blue LEDs are a very nice touch- you
 	can see them very clearly from 50 feet away.
 
 	I paid 2000$ for one used.
@@ -159,7 +159,7 @@ Sun A5X00
 	code in /usr/share/examples) for power/thermal/slot monitoring.
 
 	Approx Cost: The last I saw for a price list item on this was 22K$
-	for a unpopulated (no disk drive) A5X00.
+	for an unpopulated (no disk drive) A5X00.
 
 
 DataDirect E1000 RAID
@@ -175,7 +175,7 @@ DataDirect E1000 RAID
 Veritas ServPoint
 
 	This is a software storage virtualization engine that
-	runs on Sparc/Solaris in target mode for frontend 
+	runs on Sparc/Solaris in target mode for frontend
 	and with other FC or SCSI as the backend storage. FreeBSD
 	has been used extensively to test it.
 
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index 531af30..431c85b 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -790,7 +790,7 @@ again:
 	 * It turns out that even for QLogic 2100s with ROM 1.10 and above
 	 * we do get a firmware attributes word returned in mailbox register 6.
 	 *
-	 * Because the lun is in a a different position in the Request Queue
+	 * Because the lun is in a different position in the Request Queue
 	 * Entry structure for Fibre Channel with expanded lun firmware, we
 	 * can only support one lun (lun zero) when we don't know what kind
 	 * of firmware we're running.
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 5d71cd9..83250cf 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -563,7 +563,7 @@ lmc_rx_intr(lmc_softc_t * const sc)
 			 * length so we can set that now. (we add to
 			 * last_offset instead of multiplying since we
 			 * normally won't go into the loop and thereby
-			 * saving a ourselves from doing a multiplication
+			 * saving ourselves from doing a multiplication
 			 * by 0 in the normal case).
 			 */
 			_IF_DEQUEUE(&sc->lmc_rxq, ms);
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 317b6cc..3887ba1 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -850,7 +850,7 @@ mse_getlogi(tag, handle, dx, dy, but)
  * Routines for the ATI Inport bus mouse.
  */
 /*
- * Test for a ATI Inport bus mouse and return 1 if it is.
+ * Test for an ATI Inport bus mouse and return 1 if it is.
  * (do not enable interrupts)
  */
 static int
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 7412435..8c1d488 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -285,7 +285,7 @@ static int pcf_stop(device_t pcfdev)
 
 	/*
 	 * Send STOP condition iff the START condition was previously sent.
-	 * STOP is sent only once even if a iicbus_stop() is called after
+	 * STOP is sent only once even if an iicbus_stop() is called after
 	 * an iicbus_read()... see pcf_read(): the pcf needs to send the stop
 	 * before the last char is read.
 	 */
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index bbc41a9..98c2f1d 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/sys/dev/pst/pst-iop.c
@@ -76,7 +76,7 @@ iop_init(struct iop_softc *sc)
 
     /* register iop_attach to be run when interrupts are enabled */
     if (!(sc->iop_delayed_attach = (struct intr_config_hook *)
-				   malloc(sizeof(struct intr_config_hook), 
+				   malloc(sizeof(struct intr_config_hook),
 				   M_PSTIOP, M_NOWAIT | M_ZERO))) {
 	printf("pstiop: malloc of delayed attach hook failed\n");
 	return 0;
@@ -162,9 +162,9 @@ iop_intr(void *data)
 
 	reply = (struct i2o_single_reply *)(sc->obase + (mfa - sc->phys_obase));
 
-	/* if this is a event register reply, shout! */
+	/* If this is an event register reply, shout! */
 	if (reply->function == I2O_UTIL_EVENT_REGISTER) {
-	    struct i2o_util_event_reply_message *event = 
+	    struct i2o_util_event_reply_message *event =
 		(struct i2o_util_event_reply_message *)reply;
 
 	    printf("pstiop: EVENT!! idx=%08x data=%08x\n",
@@ -175,7 +175,7 @@ iop_intr(void *data)
 	/* if reply is a failurenotice we need to free the original mfa */
 	if (reply->message_flags & I2O_MESSAGE_FLAGS_FAIL)
 	    iop_free_mfa(sc,((struct i2o_fault_reply *)(reply))->preserved_mfa);
-	
+
 	/* reply->initiator_context points to the service routine */
 	((void (*)(struct iop_softc *, u_int32_t, struct i2o_single_reply *))
 	    (reply->initiator_context))(sc, mfa, reply);
@@ -255,7 +255,7 @@ iop_init_outqueue(struct iop_softc *sc)
     /* wait for init to complete */
     while (--timeout && reply != I2O_EXEC_OUTBOUND_INIT_COMPLETE)
 	DELAY(1000);
-    
+
     if (!timeout) {
 	printf("pstiop: timeout waiting for init-complete response\n");
 	iop_free_mfa(sc, mfa);
@@ -309,7 +309,7 @@ iop_get_lct(struct iop_softc *sc)
 	contigfree(reply, ALLOCSIZE, M_PSTIOP);
 	return 0;
     }
-    bcopy(&reply->entry[0], sc->lct, 
+    bcopy(&reply->entry[0], sc->lct,
 	  reply->table_size * sizeof(struct i2o_lct_entry));
     sc->lct_count = reply->table_size;
     contigfree(reply, ALLOCSIZE, M_PSTIOP);
@@ -432,7 +432,7 @@ iop_create_sgl(struct i2o_basic_message *msg, caddr_t data, int count, int dir)
 	printf("pstiop: zero length DMA transfer attempted\n");
 	return 0;
     }
-    
+
     sgl_count = min(count, (PAGE_SIZE - ((uintptr_t)data & PAGE_MASK)));
     sgl_phys = vtophys(data);
     sgl->flags = dir | I2O_SGL_PAGELIST | I2O_SGL_EOB | I2O_SGL_END;
diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c
index 1a06659..5e134d7 100644
--- a/sys/dev/raidframe/rf_freebsdkintf.c
+++ b/sys/dev/raidframe/rf_freebsdkintf.c
@@ -1660,7 +1660,7 @@ rf_DispatchKernelIO(queue, req)
 	/* splx(s); */ /* want to test this */
 	return (0);
 }
-/* this is the callback function associated with a I/O invoked from
+/* This is the callback function associated with an I/O invoked from
    kernel code.
  */
 static void 
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index fd4731f74..1c92d50 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -774,8 +774,8 @@ ray_init_user(struct ray_softc *sc)
 	 *		init_download	- download the network to the card
 	 *		init_mcast	- reset multicast list
 	 *		init_sj		- find or start a BSS
-	 *		init_auth	- authenticate with a ESSID if needed
-	 *		init_assoc	- associate with a ESSID if needed
+	 *		init_auth	- authenticate with an ESSID if needed
+	 *		init_assoc	- associate with an ESSID if needed
 	 *
 	 * They are only actually executed if the card is not running.
 	 * We may enter this routine from a simple change of IP
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 42d52a7..b7e1dab 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -1376,7 +1376,7 @@ mss_detect(device_t dev, struct mss_info *mss)
 		if ((tmp = io_rd(mss, MSS_INDEX)) & MSS_IDXBUSY) DELAY(10000);
 		else break;
 
-    	if (i >= 10) {	/* Not a AD1848 */
+    	if (i >= 10) {	/* Not an AD1848 */
 		BVDDB(printf("mss_detect, busy still set (0x%02x)\n", tmp));
 		goto no;
     	}
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index 0e1cb76..517bf7e 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -27,7 +27,7 @@
 /*
  * als4000.c - driver for the Avance Logic ALS 4000 chipset.
  *
- * The ALS4000 is a effectively an SB16 with a PCI interface.
+ * The ALS4000 is effectively an SB16 with a PCI interface.
  *
  * This driver derives from ALS4000a.PDF, Bart Hartgers alsa driver, and
  * SB16 register descriptions.
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 4afdd9e..866d984 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -27,7 +27,7 @@
  * Much of register handling is based on NetBSD CMI8x38 audio driver
  * by Takuya Shiozaki <AoiMoe@imou.to>.  Chen-Li Tien
  * <cltien@cmedia.com.tw> clarified points regarding the DMA related
- * registers and the 8738 mixer devices.  His Linux was driver a also
+ * registers and the 8738 mixer devices.  His Linux driver was also a
  * useful reference point.
  *
  * TODO: MIDI
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index d15a1ff..689ce89 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -5387,9 +5387,9 @@ static void sym_sir_task_recovery(hcb_p np, int num)
 
 		/*
 		 *  If we want to abort an untagged command, we 
-		 *  will send a IDENTIFY + M_ABORT.
+		 *  will send an IDENTIFY + M_ABORT.
 		 *  Otherwise (tagged command), we will send 
-		 *  a IDENTITFY + task attributes + ABORT TAG.
+		 *  an IDENTIFY + task attributes + ABORT TAG.
 		 */
 		if (cp->tag == NO_TAG) {
 			np->abrt_msg[1] = M_ABORT;
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index f8df5c9..89b9cbc 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -1935,8 +1935,8 @@ ubsec_cleanchip(struct ubsec_softc *sc)
 }
 
 /*
- * free a ubsec_q
- * It is assumed that the caller is within spimp()
+ * Free an ubsec_q.
+ * It is assumed that the caller is within spimp().
  */
 static int
 ubsec_free_q(struct ubsec_softc *sc, struct ubsec_q *q)
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 0f57724..68a8070 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1310,7 +1310,7 @@ uhci_check_intr(uhci_softc_t *sc, uhci_intr_info_t *ii)
 #endif
 	/*
 	 * If the last TD is still active we need to check whether there
-	 * is a an error somewhere in the middle, or whether there was a
+	 * is an error somewhere in the middle, or whether there was a
 	 * short packet (SPD and not ACTIVE).
 	 */
 	if (le32toh(lstd->td.td_status) & UHCI_TD_ACTIVE) {
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index d030293..726669a 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -739,7 +739,7 @@ ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 #if 0
 /* XXX This does not belong here. */
 /*
- * Print select parts of a IEEE 1284 device ID.
+ * Print select parts of an IEEE 1284 device ID.
  */
 void
 ieee1284_print_id(char *str)
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index db3c936..4fce190 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -2943,7 +2943,7 @@ Static int
 umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 		      unsigned char **rcmd, int *rcmdlen)
 {
-	/* A ATAPI command is always 12 bytes in length */
+	/* An ATAPI command is always 12 bytes in length. */
 	KASSERT(*rcmdlen >= ATAPI_COMMAND_LENGTH,
 		("rcmdlen = %d < %d, buffer too small",
 		 *rcmdlen, ATAPI_COMMAND_LENGTH));
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index f3b29ce..dfaca89 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -52,7 +52,7 @@
  * i.e., it uses MAC addresses.  This should not be a surprise since
  * it uses an ethernet controller as a major hw item.
  * It can broadcast, unicast or apparently multicast in a base cell 
- * using a omni-directional antennae that is 
+ * using an omni-directional antennae that is 
  * about 800 feet around the base cell barring walls and metal.  
  * With directional antennae, it can be used point to point over a mile
  * or so apparently (haven't tried that).