diff --git a/drivers/dma/CMakeLists.txt b/drivers/dma/CMakeLists.txt index 39fe4599ad239..240e7f364e182 100644 --- a/drivers/dma/CMakeLists.txt +++ b/drivers/dma/CMakeLists.txt @@ -13,7 +13,6 @@ zephyr_library_sources_ifdef(CONFIG_DMAMUX_STM32 dmamux_stm32.c) zephyr_library_sources_ifdef(CONFIG_DMA_DW dma_dw.c dma_dw_common.c) zephyr_library_sources_ifdef(CONFIG_DMA_NIOS2_MSGDMA dma_nios2_msgdma.c) zephyr_library_sources_ifdef(CONFIG_DMA_SAM0 dma_sam0.c) -zephyr_library_sources_ifdef(CONFIG_USERSPACE dma_handlers.c) zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_EDMA dma_mcux_edma.c) zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_EDMA_V3 dma_mcux_edma.c) zephyr_library_sources_ifdef(CONFIG_DMA_MCUX_EDMA_V4 dma_mcux_edma.c) diff --git a/drivers/dma/dma_handlers.c b/drivers/dma/dma_handlers.c deleted file mode 100644 index 9ebce367482ea..0000000000000 --- a/drivers/dma/dma_handlers.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2018 Intel Corporation - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -/* Both of these APIs are assuming that the drive implementations are checking - * the validity of the channel ID and returning -errno if it's bogus - */ - -static inline int z_vrfy_dma_start(const struct device *dev, uint32_t channel) -{ - K_OOPS(K_SYSCALL_DRIVER_DMA(dev, start)); - return z_impl_dma_start((const struct device *)dev, channel); -} -#include - -static inline int z_vrfy_dma_stop(const struct device *dev, uint32_t channel) -{ - K_OOPS(K_SYSCALL_DRIVER_DMA(dev, stop)); - return z_impl_dma_stop((const struct device *)dev, channel); -} -#include diff --git a/include/zephyr/drivers/dma.h b/include/zephyr/drivers/dma.h index 8fd42dd9a1e67..7a0954e248a27 100644 --- a/include/zephyr/drivers/dma.h +++ b/include/zephyr/drivers/dma.h @@ -451,9 +451,7 @@ static inline int dma_reload(const struct device *dev, uint32_t channel, * @retval 0 if successful. * @retval Negative errno code if failure. */ -__syscall int dma_start(const struct device *dev, uint32_t channel); - -static inline int z_impl_dma_start(const struct device *dev, uint32_t channel) +static inline int dma_start(const struct device *dev, uint32_t channel) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->api; @@ -479,9 +477,7 @@ static inline int z_impl_dma_start(const struct device *dev, uint32_t channel) * @retval 0 if successful. * @retval Negative errno code if failure. */ -__syscall int dma_stop(const struct device *dev, uint32_t channel); - -static inline int z_impl_dma_stop(const struct device *dev, uint32_t channel) +static inline int dma_stop(const struct device *dev, uint32_t channel) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->api; @@ -506,9 +502,7 @@ static inline int z_impl_dma_stop(const struct device *dev, uint32_t channel) * @retval -EINVAL If invalid channel id or state. * @retval -errno Other negative errno code failure. */ -__syscall int dma_suspend(const struct device *dev, uint32_t channel); - -static inline int z_impl_dma_suspend(const struct device *dev, uint32_t channel) +static inline int dma_suspend(const struct device *dev, uint32_t channel) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->api; @@ -534,9 +528,7 @@ static inline int z_impl_dma_suspend(const struct device *dev, uint32_t channel) * @retval -EINVAL If invalid channel id or state. * @retval -errno Other negative errno code failure. */ -__syscall int dma_resume(const struct device *dev, uint32_t channel); - -static inline int z_impl_dma_resume(const struct device *dev, uint32_t channel) +static inline int dma_resume(const struct device *dev, uint32_t channel) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->api; @@ -562,11 +554,7 @@ static inline int z_impl_dma_resume(const struct device *dev, uint32_t channel) * @retval dma channel if successful. * @retval Negative errno code if failure. */ -__syscall int dma_request_channel(const struct device *dev, - void *filter_param); - -static inline int z_impl_dma_request_channel(const struct device *dev, - void *filter_param) +static inline int dma_request_channel(const struct device *dev, void *filter_param) { int i = 0; int channel = -EINVAL; @@ -607,11 +595,7 @@ static inline int z_impl_dma_request_channel(const struct device *dev, * @param channel channel number * */ -__syscall void dma_release_channel(const struct device *dev, - uint32_t channel); - -static inline void z_impl_dma_release_channel(const struct device *dev, - uint32_t channel) +static inline void dma_release_channel(const struct device *dev, uint32_t channel) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->api; @@ -643,11 +627,7 @@ static inline void z_impl_dma_release_channel(const struct device *dev, * @retval Negative errno code if not support * */ -__syscall int dma_chan_filter(const struct device *dev, - int channel, void *filter_param); - -static inline int z_impl_dma_chan_filter(const struct device *dev, - int channel, void *filter_param) +static inline int dma_chan_filter(const struct device *dev, int channel, void *filter_param) { const struct dma_driver_api *api = (const struct dma_driver_api *)dev->api; @@ -812,6 +792,4 @@ static inline uint32_t dma_burst_index(uint32_t burst) } #endif -#include - #endif /* ZEPHYR_INCLUDE_DRIVERS_DMA_H_ */