From 7b421398c4c794b9ad6e1585df33a49818ebd7ae Mon Sep 17 00:00:00 2001 From: Phi Bang Nguyen Date: Tue, 13 May 2025 09:07:43 +0200 Subject: [PATCH] drivers: video: Rename signal variables to avoid compliance violation Rename signal variables to sig to be compliant with code rule 21.2 Signed-off-by: Phi Bang Nguyen --- drivers/video/video_mcux_csi.c | 16 ++++++++-------- drivers/video/video_sw_generator.c | 16 ++++++++-------- include/zephyr/drivers/video.h | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c index 38807290240..866f58844de 100644 --- a/drivers/video/video_mcux_csi.c +++ b/drivers/video/video_mcux_csi.c @@ -32,7 +32,7 @@ struct video_mcux_csi_data { csi_handle_t csi_handle; struct k_fifo fifo_in; struct k_fifo fifo_out; - struct k_poll_signal *signal; + struct k_poll_signal *sig; }; static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle, status_t status, void *user_data) @@ -92,8 +92,8 @@ static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle, status_t statu done: /* Trigger Event */ - if (IS_ENABLED(CONFIG_POLL) && data->signal) { - k_poll_signal_raise(data->signal, result); + if (IS_ENABLED(CONFIG_POLL) && data->sig) { + k_poll_signal_raise(data->sig, result); } return; @@ -246,8 +246,8 @@ static int video_mcux_csi_flush(const struct device *dev, bool cancel) while ((vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT))) { k_fifo_put(&data->fifo_out, vbuf); - if (IS_ENABLED(CONFIG_POLL) && data->signal) { - k_poll_signal_raise(data->signal, VIDEO_BUF_ABORTED); + if (IS_ENABLED(CONFIG_POLL) && data->sig) { + k_poll_signal_raise(data->sig, VIDEO_BUF_ABORTED); } } } @@ -371,15 +371,15 @@ static int video_mcux_csi_init(const struct device *dev) } #ifdef CONFIG_POLL -static int video_mcux_csi_set_signal(const struct device *dev, struct k_poll_signal *signal) +static int video_mcux_csi_set_signal(const struct device *dev, struct k_poll_signal *sig) { struct video_mcux_csi_data *data = dev->data; - if (data->signal && signal != NULL) { + if (data->sig && sig != NULL) { return -EALREADY; } - data->signal = signal; + data->sig = sig; return 0; } diff --git a/drivers/video/video_sw_generator.c b/drivers/video/video_sw_generator.c index 526a3549ee1..40ba10011be 100644 --- a/drivers/video/video_sw_generator.c +++ b/drivers/video/video_sw_generator.c @@ -40,7 +40,7 @@ struct video_sw_generator_data { struct k_work_delayable buf_work; struct k_work_sync work_sync; int pattern; - struct k_poll_signal *signal; + struct k_poll_signal *sig; uint32_t frame_rate; }; @@ -163,8 +163,8 @@ static void __buffer_work(struct k_work *work) k_fifo_put(&data->fifo_out, vbuf); - if (IS_ENABLED(CONFIG_POLL) && data->signal) { - k_poll_signal_raise(data->signal, VIDEO_BUF_DONE); + if (IS_ENABLED(CONFIG_POLL) && data->sig) { + k_poll_signal_raise(data->sig, VIDEO_BUF_DONE); } k_yield(); @@ -205,8 +205,8 @@ static int video_sw_generator_flush(const struct device *dev, bool cancel) } else { while ((vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT))) { k_fifo_put(&data->fifo_out, vbuf); - if (IS_ENABLED(CONFIG_POLL) && data->signal) { - k_poll_signal_raise(data->signal, VIDEO_BUF_ABORTED); + if (IS_ENABLED(CONFIG_POLL) && data->sig) { + k_poll_signal_raise(data->sig, VIDEO_BUF_ABORTED); } } } @@ -226,15 +226,15 @@ static int video_sw_generator_get_caps(const struct device *dev, struct video_ca } #ifdef CONFIG_POLL -static int video_sw_generator_set_signal(const struct device *dev, struct k_poll_signal *signal) +static int video_sw_generator_set_signal(const struct device *dev, struct k_poll_signal *sig) { struct video_sw_generator_data *data = dev->data; - if (data->signal && signal != NULL) { + if (data->sig && sig != NULL) { return -EALREADY; } - data->signal = signal; + data->sig = sig; return 0; } diff --git a/include/zephyr/drivers/video.h b/include/zephyr/drivers/video.h index d8d4594d6f2..b5a70675258 100644 --- a/include/zephyr/drivers/video.h +++ b/include/zephyr/drivers/video.h @@ -341,7 +341,7 @@ typedef int (*video_api_get_caps_t)(const struct device *dev, struct video_caps * * See video_set_signal() for argument descriptions. */ -typedef int (*video_api_set_signal_t)(const struct device *dev, struct k_poll_signal *signal); +typedef int (*video_api_set_signal_t)(const struct device *dev, struct k_poll_signal *sig); __subsystem struct video_driver_api { /* mandatory callbacks */ @@ -706,11 +706,11 @@ void video_print_ctrl(const struct device *const dev, const struct video_ctrl_qu * unregisters any previously registered signal. * * @param dev Pointer to the device structure for the driver instance. - * @param signal Pointer to k_poll_signal + * @param sig Pointer to k_poll_signal * * @retval 0 Is successful, -ERRNO code otherwise. */ -static inline int video_set_signal(const struct device *dev, struct k_poll_signal *signal) +static inline int video_set_signal(const struct device *dev, struct k_poll_signal *sig) { const struct video_driver_api *api = (const struct video_driver_api *)dev->api; @@ -718,7 +718,7 @@ static inline int video_set_signal(const struct device *dev, struct k_poll_signa return -ENOSYS; } - return api->set_signal(dev, signal); + return api->set_signal(dev, sig); } /**