Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 May 2011 00:39:47 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r221865 - in stable/8/sys/dev: ahci mvs siis
Message-ID:  <201105140039.p4E0dlWa087005@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Sat May 14 00:39:46 2011
New Revision: 221865
URL: http://svn.freebsd.org/changeset/base/221865

Log:
  MFC r220830:
  Fix some English grammar.

Modified:
  stable/8/sys/dev/ahci/ahci.c
  stable/8/sys/dev/ahci/ahci.h
  stable/8/sys/dev/mvs/mvs.c
  stable/8/sys/dev/mvs/mvs.h
  stable/8/sys/dev/siis/siis.c
  stable/8/sys/dev/siis/siis.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/ahci/ahci.c
==============================================================================
--- stable/8/sys/dev/ahci/ahci.c	Sat May 14 00:35:56 2011	(r221864)
+++ stable/8/sys/dev/ahci/ahci.c	Sat May 14 00:39:46 2011	(r221865)
@@ -2127,16 +2127,16 @@ ahci_issue_recovery(device_t dev)
 	struct ccb_scsiio *csio;
 	int i;
 
-	/* Find some holden command. */
+	/* Find some held command. */
 	for (i = 0; i < ch->numslots; i++) {
 		if (ch->hold[i])
 			break;
 	}
 	ccb = xpt_alloc_ccb_nowait();
 	if (ccb == NULL) {
-		device_printf(dev, "Unable allocate recovery command\n");
+		device_printf(dev, "Unable to allocate recovery command\n");
 completeall:
-		/* We can't do anything -- complete holden commands. */
+		/* We can't do anything -- complete held commands. */
 		for (i = 0; i < ch->numslots; i++) {
 			if (ch->hold[i] == NULL)
 				continue;
@@ -2161,7 +2161,7 @@ completeall:
 		if (ataio->data_ptr == NULL) {
 			xpt_free_ccb(ccb);
 			device_printf(dev,
-			    "Unable allocate memory for READ LOG command\n");
+			    "Unable to allocate memory for READ LOG command\n");
 			goto completeall;
 		}
 		ataio->dxfer_len = 512;

Modified: stable/8/sys/dev/ahci/ahci.h
==============================================================================
--- stable/8/sys/dev/ahci/ahci.h	Sat May 14 00:35:56 2011	(r221864)
+++ stable/8/sys/dev/ahci/ahci.h	Sat May 14 00:39:46 2011	(r221865)
@@ -408,7 +408,7 @@ struct ahci_channel {
 	int			numrslotspd[16];/* Number of running slots per dev */
 	int			numtslots;	/* Number of tagged slots */
 	int			numtslotspd[16];/* Number of tagged slots per dev */
-	int			numhslots;	/* Number of holden slots */
+	int			numhslots;	/* Number of held slots */
 	int			recoverycmd;	/* Our READ LOG active */
 	int			fatalerr;	/* Fatal error happend */
 	int			lastslot;	/* Last used slot */

Modified: stable/8/sys/dev/mvs/mvs.c
==============================================================================
--- stable/8/sys/dev/mvs/mvs.c	Sat May 14 00:35:56 2011	(r221864)
+++ stable/8/sys/dev/mvs/mvs.c	Sat May 14 00:39:46 2011	(r221865)
@@ -1780,16 +1780,16 @@ mvs_issue_recovery(device_t dev)
 	struct ccb_scsiio *csio;
 	int i;
 
-	/* Find some holden command. */
+	/* Find some held command. */
 	for (i = 0; i < MVS_MAX_SLOTS; i++) {
 		if (ch->hold[i])
 			break;
 	}
 	ccb = xpt_alloc_ccb_nowait();
 	if (ccb == NULL) {
-		device_printf(dev, "Unable allocate recovery command\n");
+		device_printf(dev, "Unable to allocate recovery command\n");
 completeall:
-		/* We can't do anything -- complete holden commands. */
+		/* We can't do anything -- complete held commands. */
 		for (i = 0; i < MVS_MAX_SLOTS; i++) {
 			if (ch->hold[i] == NULL)
 				continue;
@@ -1814,7 +1814,7 @@ completeall:
 		if (ataio->data_ptr == NULL) {
 			xpt_free_ccb(ccb);
 			device_printf(dev,
-			    "Unable allocate memory for READ LOG command\n");
+			    "Unable to allocate memory for READ LOG command\n");
 			goto completeall;
 		}
 		ataio->dxfer_len = 512;

Modified: stable/8/sys/dev/mvs/mvs.h
==============================================================================
--- stable/8/sys/dev/mvs/mvs.h	Sat May 14 00:35:56 2011	(r221864)
+++ stable/8/sys/dev/mvs/mvs.h	Sat May 14 00:39:46 2011	(r221865)
@@ -538,7 +538,7 @@ struct mvs_channel {
 
 	struct mvs_slot		slot[MVS_MAX_SLOTS];
 	union ccb		*hold[MVS_MAX_SLOTS];
-	int			holdtag[MVS_MAX_SLOTS]; /* Tags used for holden commands. */
+	int			holdtag[MVS_MAX_SLOTS]; /* Tags used for held commands. */
 	struct mtx		mtx;		/* state lock */
 	int			devices;        /* What is present */
 	int			pm_present;	/* PM presence reported */
@@ -556,7 +556,7 @@ struct mvs_channel {
 	int			numdslots;	/* Number of DMA slots */
 	int			numtslots;	/* Number of NCQ slots */
 	int			numtslotspd[16];/* Number of NCQ slots per dev */
-	int			numhslots;	/* Number of holden slots */
+	int			numhslots;	/* Number of held slots */
 	int			recoverycmd;	/* Our READ LOG active */
 	int			fatalerr;	/* Fatal error happend */
 	int			lastslot;	/* Last used slot */

Modified: stable/8/sys/dev/siis/siis.c
==============================================================================
--- stable/8/sys/dev/siis/siis.c	Sat May 14 00:35:56 2011	(r221864)
+++ stable/8/sys/dev/siis/siis.c	Sat May 14 00:39:46 2011	(r221865)
@@ -1366,7 +1366,7 @@ siis_issue_recovery(device_t dev)
 	struct ccb_scsiio *csio;
 	int i;
 
-	/* Find some holden command. */
+	/* Find some held command. */
 	for (i = 0; i < SIIS_MAX_SLOTS; i++) {
 		if (ch->hold[i])
 			break;
@@ -1375,9 +1375,9 @@ siis_issue_recovery(device_t dev)
 		return;
 	ccb = xpt_alloc_ccb_nowait();
 	if (ccb == NULL) {
-		device_printf(dev, "Unable allocate recovery command\n");
+		device_printf(dev, "Unable to allocate recovery command\n");
 completeall:
-		/* We can't do anything -- complete holden commands. */
+		/* We can't do anything -- complete held commands. */
 		for (i = 0; i < SIIS_MAX_SLOTS; i++) {
 			if (ch->hold[i] == NULL)
 				continue;
@@ -1402,7 +1402,7 @@ completeall:
 		if (ataio->data_ptr == NULL) {
 			xpt_free_ccb(ccb);
 			device_printf(dev,
-			    "Unable allocate memory for READ LOG command\n");
+			    "Unable to allocate memory for READ LOG command\n");
 			goto completeall;
 		}
 		ataio->dxfer_len = 512;
@@ -1601,7 +1601,7 @@ siis_reset(device_t dev)
 		/* XXX; Commands in loading state. */
 		siis_end_transaction(&ch->slot[i], SIIS_ERR_INNOCENT);
 	}
-	/* Finish all holden commands as-is. */
+	/* Finish all held commands as-is. */
 	for (i = 0; i < SIIS_MAX_SLOTS; i++) {
 		if (!ch->hold[i])
 			continue;

Modified: stable/8/sys/dev/siis/siis.h
==============================================================================
--- stable/8/sys/dev/siis/siis.h	Sat May 14 00:35:56 2011	(r221864)
+++ stable/8/sys/dev/siis/siis.h	Sat May 14 00:39:46 2011	(r221865)
@@ -387,7 +387,7 @@ struct siis_channel {
 	uint32_t		toslots;	/* Slots in timeout */
 	int			numrslots;	/* Number of running slots */
 	int			numtslots[SIIS_MAX_SLOTS]; /* Number of tagged slots */
-	int			numhslots;	/* Number of holden slots */
+	int			numhslots;	/* Number of held slots */
 	int			recoverycmd;	/* Our READ LOG active */
 	int			fatalerr;	/* Fatal error happend */
 	int			recovery;	/* Some slots are in error */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105140039.p4E0dlWa087005>