adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

drivers: devmux: use int instead of ssize_t for select_get()

Browse source 
Use int instead of ssize_t for select_get().

This eliminates the unnecessary need for POSIX types.

Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>
This commit is contained in:
Chris Friedt 2024-10-16 18:29:31 -04:00 committed by Maureen Helm
parent df201e4b4b
commit d22a49536f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/misc/devmux/devmux.c
View file

@ -6,6 +6,8 @@
#define DT_DRV_COMPAT zephyr_devmux #define DT_DRV_COMPAT zephyr_devmux
#include <limits.h>
#include <zephyr/device.h> #include <zephyr/device.h>
#include <zephyr/drivers/misc/devmux/devmux.h> #include <zephyr/drivers/misc/devmux/devmux.h>
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
@ -72,9 +74,9 @@ struct devmux_data *devmux_data_get(const struct device *dev)
return NULL; 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); struct devmux_data *const data = devmux_data_get(dev);
if (!devmux_device_is_valid(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 #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); 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), \ BUILD_ASSERT(DT_INST_PROP_OR(_n, zephyr_mutable, 0), \
"devmux nodes must contain the 'zephyr,mutable' property"); \ "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) > 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) >= 0, "selected must be > 0"); \
BUILD_ASSERT(DEVMUX_SELECTED(_n) < DT_INST_PROP_LEN(_n, devices), \ BUILD_ASSERT(DEVMUX_SELECTED(_n) < DT_INST_PROP_LEN(_n, devices), \
"selected must be within bounds of devices phandle array"); \ "selected must be within bounds of devices phandle array"); \

2
include/zephyr/drivers/misc/devmux/devmux.h
View file

@ -62,7 +62,7 @@ extern "C" {
* @return The index (>= 0) of the currently active multiplexed device on success * @return The index (>= 0) of the currently active multiplexed device on success
* @retval -EINVAL If @p dev is invalid * @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. * @brief Set the selection of a devmux device.