From d22a49536f0c0d7e1621f899b03704222af71dcb Mon Sep 17 00:00:00 2001 From: Chris Friedt Date: Wed, 16 Oct 2024 18:29:31 -0400 Subject: [PATCH] drivers: devmux: use int instead of ssize_t for select_get() Use int instead of ssize_t for select_get(). This eliminates the unnecessary need for POSIX types. Signed-off-by: Chris Friedt --- drivers/misc/devmux/devmux.c | 10 +++++++--- include/zephyr/drivers/misc/devmux/devmux.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/misc/devmux/devmux.c b/drivers/misc/devmux/devmux.c index 675b635b5d0..d8c1a9b90c7 100644 --- a/drivers/misc/devmux/devmux.c +++ b/drivers/misc/devmux/devmux.c @@ -6,6 +6,8 @@ #define DT_DRV_COMPAT zephyr_devmux +#include + #include #include #include @@ -72,9 +74,9 @@ struct devmux_data *devmux_data_get(const struct device *dev) return NULL; } -ssize_t z_impl_devmux_select_get(const struct device *dev) +int z_impl_devmux_select_get(const struct device *dev) { - ssize_t index; + int index; struct devmux_data *const data = devmux_data_get(dev); if (!devmux_device_is_valid(dev)) { @@ -90,7 +92,7 @@ ssize_t z_impl_devmux_select_get(const struct device *dev) } #ifdef CONFIG_USERSPACE -ssize_t z_vrfy_devmux_select_get(const struct device *dev) +int z_vrfy_devmux_select_get(const struct device *dev) { return z_impl_devmux_select_get(dev); } @@ -158,6 +160,8 @@ static int devmux_init(struct device *const dev) BUILD_ASSERT(DT_INST_PROP_OR(_n, zephyr_mutable, 0), \ "devmux nodes must contain the 'zephyr,mutable' property"); \ BUILD_ASSERT(DT_INST_PROP_LEN(_n, devices) > 0, "devices array must have non-zero size"); \ + BUILD_ASSERT(DT_INST_PROP_LEN(_n, devices) <= INT_MAX, \ + "devices array must be less than INT_MAX"); \ BUILD_ASSERT(DEVMUX_SELECTED(_n) >= 0, "selected must be > 0"); \ BUILD_ASSERT(DEVMUX_SELECTED(_n) < DT_INST_PROP_LEN(_n, devices), \ "selected must be within bounds of devices phandle array"); \ diff --git a/include/zephyr/drivers/misc/devmux/devmux.h b/include/zephyr/drivers/misc/devmux/devmux.h index 8b01d633a94..4c084199d5a 100644 --- a/include/zephyr/drivers/misc/devmux/devmux.h +++ b/include/zephyr/drivers/misc/devmux/devmux.h @@ -62,7 +62,7 @@ extern "C" { * @return The index (>= 0) of the currently active multiplexed device on success * @retval -EINVAL If @p dev is invalid */ -__syscall ssize_t devmux_select_get(const struct device *dev); +__syscall int devmux_select_get(const struct device *dev); /** * @brief Set the selection of a devmux device.