Author: mav
Date: Tue Apr 19 10:57:40 2011
New Revision: 220830
URL: http://svn.freebsd.org/changeset/base/220830
Log:
Fix some English grammar.
Modified:
head/sys/dev/ahci/ahci.c
head/sys/dev/ahci/ahci.h
head/sys/dev/mvs/mvs.c
head/sys/dev/mvs/mvs.h
head/sys/dev/siis/siis.c
head/sys/dev/siis/siis.h
Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c Tue Apr 19 10:51:19 2011 (r220829)
+++ head/sys/dev/ahci/ahci.c Tue Apr 19 10:57:40 2011 (r220830)
@@ -2132,16 +2132,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;
@@ -2166,7 +2166,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: head/sys/dev/ahci/ahci.h
==============================================================================
--- head/sys/dev/ahci/ahci.h Tue Apr 19 10:51:19 2011 (r220829)
+++ head/sys/dev/ahci/ahci.h Tue Apr 19 10:57:40 2011 (r220830)
@@ -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: head/sys/dev/mvs/mvs.c
==============================================================================
--- head/sys/dev/mvs/mvs.c Tue Apr 19 10:51:19 2011 (r220829)
+++ head/sys/dev/mvs/mvs.c Tue Apr 19 10:57:40 2011 (r220830)
@@ -1781,16 +1781,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;
@@ -1815,7 +1815,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: head/sys/dev/mvs/mvs.h
==============================================================================
--- head/sys/dev/mvs/mvs.h Tue Apr 19 10:51:19 2011 (r220829)
+++ head/sys/dev/mvs/mvs.h Tue Apr 19 10:57:40 2011 (r220830)
@@ -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: head/sys/dev/siis/siis.c
==============================================================================
--- head/sys/dev/siis/siis.c Tue Apr 19 10:51:19 2011 (r220829)
+++ head/sys/dev/siis/siis.c Tue Apr 19 10:57:40 2011 (r220830)
@@ -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: head/sys/dev/siis/siis.h
==============================================================================
--- head/sys/dev/siis/siis.h Tue Apr 19 10:51:19 2011 (r220829)
+++ head/sys/dev/siis/siis.h Tue Apr 19 10:57:40 2011 (r220830)
@@ -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 */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
