Date: Mon, 6 Dec 2021 15:55:13 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 5f930960ab88 - stable/12 - Fix typo on "Celsius" Message-ID: <202112061555.1B6FtDAe032661@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5f930960ab8878e2d0149b770f99b09dda057c4e commit 5f930960ab8878e2d0149b770f99b09dda057c4e Author: Elyes HAOUAS <ehaouas@noos.fr> AuthorDate: 2021-10-06 15:32:15 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-12-06 15:54:09 +0000 Fix typo on "Celsius" "Celcius" --> "Celsius" Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Pull Request: https://github.com/freebsd/freebsd-src/pull/551/files (cherry picked from commit 9097ac9af4144187d080cf6c796c50d777e517b1) --- share/man/man4/gpioths.4 | 2 +- sys/arm/freescale/imx/imx6_anatop.c | 4 ++-- sys/dev/bxe/ecore_hsi.h | 8 ++++---- sys/dev/cxgb/common/cxgb_aq100x.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 4 ++-- sys/dev/qlnx/qlnxe/mcp_public.h | 2 +- sys/dev/usb/misc/ugold.c | 10 +++++----- .../prometheus_sysctl_exporter/prometheus_sysctl_exporter.c | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/share/man/man4/gpioths.4 b/share/man/man4/gpioths.4 index 13b1040f2b25..19250b13107e 100644 --- a/share/man/man4/gpioths.4 +++ b/share/man/man4/gpioths.4 @@ -80,7 +80,7 @@ humidity measurements. The current temperature in integer deciKelvins. Note that .Xr sysctl 8 -will convert those units to display in decimal degrees Celcius. +will convert those units to display in decimal degrees Celsius. .It Va dev.gpioths.<unit>.hum The current relative humidity, as an integer percentage. .It Va dev.gpioths.<unit>.fails diff --git a/sys/arm/freescale/imx/imx6_anatop.c b/sys/arm/freescale/imx/imx6_anatop.c index 7fe78d13e806..2e2b7831385c 100644 --- a/sys/arm/freescale/imx/imx6_anatop.c +++ b/sys/arm/freescale/imx/imx6_anatop.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); * Note that temperature values throughout this code are handled in two types of * units. Items with '_cnt' in the name use the hardware temperature count * units (higher counts are lower temperatures). Items with '_val' in the name - * are deci-Celcius, which are converted to/from deci-Kelvins in the sysctl + * are deci-Celsius, which are converted to/from deci-Kelvins in the sysctl * handlers (dK is the standard unit for temperature in sysctl). */ @@ -140,7 +140,7 @@ static struct oppt { */ static uint32_t imx6_ocotp_mhz_tab[] = {792, 852, 996, 1200}; -#define TZ_ZEROC 2731 /* deci-Kelvin <-> deci-Celcius offset. */ +#define TZ_ZEROC 2731 /* deci-Kelvin <-> deci-Celsius offset. */ uint32_t imx6_anatop_read_4(bus_size_t offset) diff --git a/sys/dev/bxe/ecore_hsi.h b/sys/dev/bxe/ecore_hsi.h index 22f0767e6b0f..28a3ea923185 100644 --- a/sys/dev/bxe/ecore_hsi.h +++ b/sys/dev/bxe/ecore_hsi.h @@ -1185,12 +1185,12 @@ struct shm_dev_info { /* size */ struct extended_dev_info_shared_cfg { /* NVRAM OFFSET */ - /* Threshold in celcius to start using the fan */ + /* Threshold in celsius to start using the fan */ uint32_t temperature_monitor1; /* 0x4000 */ #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_FAN_THRESH_MASK 0x0000007F #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_FAN_THRESH_SHIFT 0 - /* Threshold in celcius to shut down the board */ + /* Threshold in celsius to shut down the board */ #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_SHUT_THRESH_MASK 0x00007F00 #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_SHUT_THRESH_SHIFT 8 @@ -1366,12 +1366,12 @@ struct extended_dev_info_shared_cfg { /* NVRAM OFFSET */ #define EXTENDED_DEV_INFO_SHARED_CFG_REV_ID_CTRL_ACTUAL 0x00001000 #define EXTENDED_DEV_INFO_SHARED_CFG_REV_ID_CTRL_FORCE_B0 0x00002000 #define EXTENDED_DEV_INFO_SHARED_CFG_REV_ID_CTRL_FORCE_B1 0x00003000 - /* Threshold in celcius for max continuous operation */ + /* Threshold in celsius for max continuous operation */ uint32_t temperature_report; /* 0x4014 */ #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_MCOT_MASK 0x0000007F #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_MCOT_SHIFT 0 - /* Threshold in celcius for sensor caution */ + /* Threshold in celsius for sensor caution */ #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_SCT_MASK 0x00007F00 #define EXTENDED_DEV_INFO_SHARED_CFG_TEMP_SCT_SHIFT 8 diff --git a/sys/dev/cxgb/common/cxgb_aq100x.c b/sys/dev/cxgb/common/cxgb_aq100x.c index 78a76b2cc47c..8c06f9f5ab20 100644 --- a/sys/dev/cxgb/common/cxgb_aq100x.c +++ b/sys/dev/cxgb/common/cxgb_aq100x.c @@ -79,7 +79,7 @@ enum { } while (0) /* - * Return value is temperature in celcius, 0xffff for error or don't know. + * Return value is temperature in celsius, 0xffff for error or don't know. */ static int aq100x_temperature(struct cphy *phy) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index 9469f41b044d..88c6fa7016e2 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -852,7 +852,7 @@ mlx5e_hw_temperature_update(struct mlx5e_priv *priv) MLX5_ACCESS_REG_SUMMARY_CTRL_ID_MTMP, 0, 0); if (err) goto done; - /* convert from 0.125 celcius to millicelcius */ + /* convert from 0.125 celsius to millicelsius */ priv->params_ethtool.hw_val_temp[x] = (s16)MLX5_GET(mtmp_reg, out_sensor, temperature) * 125; } @@ -1606,6 +1606,6 @@ mlx5e_create_ethtool(struct mlx5e_priv *priv) OID_AUTO, "hw_temperature", CTLTYPE_S32 | CTLFLAG_RD | CTLFLAG_MPSAFE, priv, 0, mlx5e_hw_temperature_handler, "I", - "HW temperature in millicelcius"); + "HW temperature in millicelsius"); } } diff --git a/sys/dev/qlnx/qlnxe/mcp_public.h b/sys/dev/qlnx/qlnxe/mcp_public.h index dca635fc4c53..a322fa3928c6 100644 --- a/sys/dev/qlnx/qlnxe/mcp_public.h +++ b/sys/dev/qlnx/qlnxe/mcp_public.h @@ -515,7 +515,7 @@ struct public_global { u32 debug_mb_offset; u32 phymod_dbg_mb_offset; struct couple_mode_teaming cmt; - s32 internal_temperature; /* Temperature in Celcius (-255C / +255C), measured every second. */ + s32 internal_temperature; /* Temperature in Celsius (-255C / +255C), measured every second. */ u32 mfw_ver; u32 running_bundle_id; s32 external_temperature; diff --git a/sys/dev/usb/misc/ugold.c b/sys/dev/usb/misc/ugold.c index 88190b03a086..171c348fb90a 100644 --- a/sys/dev/usb/misc/ugold.c +++ b/sys/dev/usb/misc/ugold.c @@ -248,7 +248,7 @@ ugold_attach(device_t dev) SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(sensor_tree), OID_AUTO, "inner", CTLFLAG_RD, &sc->sc_sensor[UGOLD_INNER], 0, - "Inner temperature in microCelcius"); + "Inner temperature in microCelsius"); SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(sensor_tree), @@ -258,17 +258,17 @@ ugold_attach(device_t dev) SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(sensor_tree), OID_AUTO, "inner_calib", CTLFLAG_RWTUN, &sc->sc_calib[UGOLD_INNER], 0, - "Inner calibration temperature in microCelcius"); - + "Inner calibration temperature in microCelsius"); + SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(sensor_tree), OID_AUTO, "outer", CTLFLAG_RD, &sc->sc_sensor[UGOLD_OUTER], 0, - "Outer temperature in microCelcius"); + "Outer temperature in microCelsius"); SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(sensor_tree), OID_AUTO, "outer_calib", CTLFLAG_RWTUN, &sc->sc_calib[UGOLD_OUTER], 0, - "Outer calibration temperature in microCelcius"); + "Outer calibration temperature in microCelsius"); SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(sensor_tree), diff --git a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c index 25e60f5dddbe..9d50c3e58750 100644 --- a/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c +++ b/usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c @@ -300,7 +300,7 @@ oid_get_value(const struct oid *o, const struct oidformat *of, return (false); } - /* Convert temperatures from decikelvin to degrees Celcius. */ + /* Convert temperatures from decikelvin to degrees Celsius. */ if (oidformat_is_temperature(of)) { double v; int e; @@ -403,7 +403,7 @@ oid_get_metric(const struct oidname *on, const struct oidformat *of, label += strlen(label) + 1; } if (oidformat_is_temperature(of)) - strlcat(metric, "_celcius", mlen); + strlcat(metric, "_celsius", mlen); else if (oidformat_is_timeval(of)) strlcat(metric, "_seconds", mlen);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112061555.1B6FtDAe032661>