Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaureenHelm merged 1 commit into from
Oct 21, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions drivers/misc/devmux/devmux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

#define DT_DRV_COMPAT zephyr_devmux

#include <limits.h>

#include <zephyr/device.h>
#include <zephyr/drivers/misc/devmux/devmux.h>
#include <zephyr/kernel.h>
Expand Down Expand Up @@ -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)) {
Expand All @@ -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);
}
Expand Down Expand Up @@ -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"); \
Expand Down
2 changes: 1 addition & 1 deletion include/zephyr/drivers/misc/devmux/devmux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading