svn commit: r251936 - in stable/9/sys: dev/bxe dev/esp dev/twa xen/xenstore

[Alexander Motin]

Author: mav
Date: Tue Jun 18 13:34:37 2013
New Revision: 251936
URL: http://svnweb.freebsd.org/changeset/base/251936

Log:
  MFC r228526 (by kevlo):
  s/timout/timeout

Modified:
  stable/9/sys/dev/bxe/bxe_reg.h
  stable/9/sys/dev/esp/ncr53c9x.c
  stable/9/sys/dev/twa/tw_osl.h
  stable/9/sys/xen/xenstore/xenstore.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/bxe/bxe_reg.h
==============================================================================
--- stable/9/sys/dev/bxe/bxe_reg.h	Tue Jun 18 12:18:55 2013	(r251935)
+++ stable/9/sys/dev/bxe/bxe_reg.h	Tue Jun 18 13:34:37 2013	(r251936)
@@ -1594,7 +1594,7 @@
 /*
  * [RW 1] Setting this bit enables a timer in the GRC block to timeout an
  * access that does not finish within
- * ~misc_registers_grc_timout_val.grc_timeout_val cycles. When this bit is
+ * ~misc_registers_grc_timeout_val.grc_timeout_val cycles. When this bit is
  * cleared; this timeout is disabled. If this timeout occurs; the GRC shall
  * assert it attention output.
  */

Modified: stable/9/sys/dev/esp/ncr53c9x.c
==============================================================================
--- stable/9/sys/dev/esp/ncr53c9x.c	Tue Jun 18 12:18:55 2013	(r251935)
+++ stable/9/sys/dev/esp/ncr53c9x.c	Tue Jun 18 13:34:37 2013	(r251936)
@@ -316,7 +316,7 @@ ncr53c9x_attach(struct ncr53c9x_softc *s
 	 * The recommended timeout is 250ms.  This register is loaded
 	 * with a value calculated as follows, from the docs:
 	 *
-	 *		(timout period) x (CLK frequency)
+	 *		(timeout period) x (CLK frequency)
 	 *	reg = -------------------------------------
 	 *		 8192 x (Clock Conversion Factor)
 	 *

Modified: stable/9/sys/dev/twa/tw_osl.h
==============================================================================
--- stable/9/sys/dev/twa/tw_osl.h	Tue Jun 18 12:18:55 2013	(r251935)
+++ stable/9/sys/dev/twa/tw_osl.h	Tue Jun 18 13:34:37 2013	(r251936)
@@ -148,7 +148,7 @@ struct twa_softc {
 	struct mtx		sim_lock_handle;/* sim lock shared with cam */
 	struct mtx		*sim_lock;/* ptr to sim lock */
 
-	struct callout		watchdog_callout[2]; /* For command timout */
+	struct callout		watchdog_callout[2]; /* For command timeout */
 	TW_UINT32		watchdog_index;
 
 #ifdef TW_OSL_DEBUG

Modified: stable/9/sys/xen/xenstore/xenstore.c
==============================================================================
--- stable/9/sys/xen/xenstore/xenstore.c	Tue Jun 18 12:18:55 2013	(r251935)
+++ stable/9/sys/xen/xenstore/xenstore.c	Tue Jun 18 13:34:37 2013	(r251936)
@@ -559,7 +559,7 @@ xs_read_store(void *tdata, unsigned len)
 			 * when msleep returns.
 			 */
 			error = msleep(xen_store, &xs.ring_lock, PCATCH|PDROP,
-			    "xbread", /*timout*/0);
+			    "xbread", /*timeout*/0);
 			if (error && error != EWOULDBLOCK)
 				return (error);
 			continue;