git: 500c37551c0b - stable/12 - bhnd(4): Correct some typos in source code comments
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 07 Sep 2022 07:53:44 UTC
The branch stable/12 has been updated by gbe (doc committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=500c37551c0b5229076a7d7f48cdb90adbf76aeb
commit 500c37551c0b5229076a7d7f48cdb90adbf76aeb
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2022-09-04 10:49:42 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2022-09-07 07:53:32 +0000
bhnd(4): Correct some typos in source code comments
- s/occured/occurred/
While here, fix some whitespace issues.
(cherry picked from commit 88cdf609e411a1ba398e9e3e93ad82345ad8b516)
---
sys/dev/bhnd/bcma/bcma_erom.c | 4 ++--
sys/dev/bhnd/bhnd.h | 2 +-
sys/dev/bhnd/bhnd_bus_if.m | 2 +-
sys/dev/bhnd/bhnd_erom.c | 4 ++--
sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c | 2 +-
sys/dev/bhnd/nvram/bhnd_nvram_io.c | 22 +++++++++++-----------
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/sys/dev/bhnd/bcma/bcma_erom.c b/sys/dev/bhnd/bcma/bcma_erom.c
index 6facbc9a2a37..86e92a1f5a9d 100644
--- a/sys/dev/bhnd/bcma/bcma_erom.c
+++ b/sys/dev/bhnd/bcma/bcma_erom.c
@@ -721,13 +721,13 @@ bcma_erom_seek_matching_core(struct bcma_erom *sc,
return (0);
}
- /* Not found, or a parse error occured */
+ /* Not found, or a parse error occurred */
return (error);
}
/**
* Read the next core descriptor from the EROM table.
- *
+ *
* @param erom EROM read state.
* @param[out] core On success, will be populated with the parsed core
* descriptor data.
diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h
index 93e7a304760d..258cb3d392c4 100644
--- a/sys/dev/bhnd/bhnd.h
+++ b/sys/dev/bhnd/bhnd.h
@@ -829,7 +829,7 @@ bhnd_read_iost(device_t dev, uint16_t *iost)
* @param dev The device to query.
*
* @retval true If @p dev is held in RESET or not clocked (BHND_IOCTL_CLK_EN),
- * or an error occured determining @p dev's hardware state.
+ * or an error occurred determining @p dev's hardware state.
* @retval false If @p dev is clocked and is not held in RESET.
*/
static inline bool
diff --git a/sys/dev/bhnd/bhnd_bus_if.m b/sys/dev/bhnd/bhnd_bus_if.m
index 23fa847d9bd9..379898f9af26 100644
--- a/sys/dev/bhnd/bhnd_bus_if.m
+++ b/sys/dev/bhnd/bhnd_bus_if.m
@@ -616,7 +616,7 @@ METHOD int read_iost {
* @param child The device to query.
*
* @retval true If @p child is held in RESET or not clocked (BHND_IOCTL_CLK_EN),
- * or an error occured determining @p child's hardware state.
+ * or an error occurred determining @p child's hardware state.
* @retval false If @p child is clocked and is not held in RESET.
*/
METHOD bool is_hw_suspended {
diff --git a/sys/dev/bhnd/bhnd_erom.c b/sys/dev/bhnd/bhnd_erom.c
index 71e8510d4a5c..e8a7be77f4a9 100644
--- a/sys/dev/bhnd/bhnd_erom.c
+++ b/sys/dev/bhnd/bhnd_erom.c
@@ -159,7 +159,7 @@ bhnd_erom_probe_driver_classes(devclass_t bus_devclass,
/**
* Allocate and return a new device enumeration table parser.
- *
+ *
* @param cls The parser class for which an instance will be
* allocated.
* @param eio The bus I/O callbacks to use when reading the device
@@ -167,7 +167,7 @@ bhnd_erom_probe_driver_classes(devclass_t bus_devclass,
* @param cid The device's chip identifier.
*
* @retval non-NULL success
- * @retval NULL if an error occured allocating or initializing the
+ * @retval NULL if an error occurred allocating or initializing the
* EROM parser.
*/
bhnd_erom_t *
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c b/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c
index b046bb674438..bc01a94d1c9e 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c
@@ -359,7 +359,7 @@ bhnd_nvram_sprom_getvar_direct(struct bhnd_nvram_io *io, const char *name,
if (error == ENOENT)
return (ENOENT);
- /* Some other parse error occured */
+ /* Some other parse error occurred */
return (error);
}
diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_io.c b/sys/dev/bhnd/nvram/bhnd_nvram_io.c
index 7ceb33e5cbc5..183510752ebe 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_io.c
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_io.c
@@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");
#include "bhnd_nvram_io.h"
#include "bhnd_nvram_iovar.h"
-/**
+/**
* Read exactly @p nbytes from @p io at @p offset.
- *
+ *
* @param io NVRAM I/O context.
* @param offset The offset within @p io at which to perform the read.
* @param[out] buffer Output buffer to which @p nbytes from @p io will be
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
* @param nbytes The maximum number of bytes to be read from @p io.
*
* @retval 0 success
- * @retval EIO if an input error occured reading @p io.
+ * @retval EIO if an input error occurred reading @p io.
* @retval ENXIO if the request for @p offset or @p nbytes exceeds the size
* of @p io.
* @retval EFAULT if @p io requires I/O request alignment and @p offset is
@@ -70,11 +70,11 @@ bhnd_nvram_io_read(struct bhnd_nvram_io *io, size_t offset, void *buffer,
/**
* Attempt to fetch a pointer to @p io's internal read buffer, if
* supported by @p io.
- *
+ *
* The returned pointer is only gauranteed to be valid until the next I/O
* operation performed on @p io; concrete implementations of bhnd_nvram_io
* may provide stronger gaurantees.
- *
+ *
* @param io NVRAM I/O context.
* @param offset The offset within @p io for which to return a buffer pointer.
* @param[out] ptr On success, will be initialized with a pointer to @p io's
@@ -83,10 +83,10 @@ bhnd_nvram_io_read(struct bhnd_nvram_io *io, size_t offset, void *buffer,
* @param[out] navail The actual number of readable bytes, which may be greater
* than @p nbytes. If this value is not required, a NULL pointer may be
* provided.
- *
+ *
* @retval 0 success
- * @retval EIO if an input error occured reading @p io.
- * @retval ENODEV if @p io does not support direct access to its backing read
+ * @retval EIO if an input error occurred reading @p io.
+ * @retval ENODEV if @p io does not support direct access to its backing read
* buffer.
* @retval ENXIO if the request exceeds the size of @p io.
* @retval EFAULT if @p io requires I/O request alignment and @p offset or
@@ -99,9 +99,9 @@ bhnd_nvram_io_read_ptr(struct bhnd_nvram_io *io, size_t offset,
return (io->iops->read_ptr(io, offset, ptr, nbytes, navail));
}
-/**
+/**
* Write @p nbytes to @p io at @p offset.
- *
+ *
* @param io NVRAM I/O context.
* @param offset The offset within @p io at which to perform the write.
* @param buffer Data to be written to @p io.
@@ -194,7 +194,7 @@ bhnd_nvram_io_setsize(struct bhnd_nvram_io *io, size_t size)
/**
* Free a previously allocated I/O context, releasing all associated
* resources.
- *
+ *
* @param io The I/O context to be freed.
*/
void