4 files changed, 5 insertions, 5 deletions

diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index 8ec26aa1080e4..1b5e23083d89d 100644
--- a/sys/dev/aac/aac_cam.c
+++ b/sys/dev/aac/aac_cam.c
@@ -555,7 +555,7 @@ aac_cam_fix_inquiry(struct aac_softc *sc, union ccb *ccb)
 			/*
 			 * Some aac(4) adapters will always report that a direct
 			 * access device is offline in response to a INQUIRY
-			 * command that does not retreive vital product data.
+			 * command that does not retrieve vital product data.
 			 * Force the qualifier to connected so that upper layers
 			 * correctly recognize that a disk is present.
 			 */
@@ -590,7 +590,7 @@ aac_cam_complete(struct aac_command *cm)
 	} else {
 		/*
 		 * The SRB error codes just happen to match the CAM error
-		 * codes.  How convienient!
+		 * codes.  How convenient!
 		 */
 		ccb->ccb_h.status = srbr->srb_status;
 
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index 353c6fa214151..6dd84f5060fd7 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -351,7 +351,7 @@ aac_print_aif(struct aac_softc *sc, struct aac_aif_command *aif)
 			device_printf(sc->aac_dev, "(ClusterEvent) event %d\n",
 				      aif->data.EN.data.ECLE.eventType);
 			break;
-		case AifEnDiskSetEvent:		/* A disk set event occured. */
+		case AifEnDiskSetEvent:		/* A disk set event occurred. */
 			device_printf(sc->aac_dev, "(DiskSetEvent) event %d "
 				      "diskset %jd creator %jd\n",
 				      aif->data.EN.data.EDS.eventType,
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 394e057acdde9..89c0fa6d67380 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -88,7 +88,7 @@ DRIVER_MODULE(aacd, aac, aac_disk_driver, aac_disk_devclass, NULL, NULL);
  * Handle open from generic layer.
  *
  * This is called by the diskslice code on first open in order to get the
- * basic device geometry paramters.
+ * basic device geometry parameters.
  */
 static int
 aac_disk_open(struct disk *dp)
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index 99597787dcbce..70859bbff051b 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -886,7 +886,7 @@ typedef enum {
 	AifEnSMARTEvent,		/* SMART Event */
 	AifEnBatteryNeedsRecond,	/* The battery needs reconditioning */
 	AifEnClusterEvent,		/* Some cluster event */
-	AifEnDiskSetEvent,		/* A disk set event occured. */
+	AifEnDiskSetEvent,		/* A disk set event occurred. */
 	AifEnContainerScsiEvent,	/* a container event with no. and scsi id */
 	AifEnPicBatteryEvent,	/* An event gen. by pic_battery.c for an ABM */
 	AifEnExpEvent,		/* Exp. Event Type to replace CTPopUp messages */