Skip to content

Commit 7b42139

Browse files
ngphibangkartben
authored andcommitted
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 <phibang.nguyen@nxp.com>
1 parent 9fa1aee commit 7b42139

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

drivers/video/video_mcux_csi.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct video_mcux_csi_data {
3232
csi_handle_t csi_handle;
3333
struct k_fifo fifo_in;
3434
struct k_fifo fifo_out;
35-
struct k_poll_signal *signal;
35+
struct k_poll_signal *sig;
3636
};
3737

3838
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
9292

9393
done:
9494
/* Trigger Event */
95-
if (IS_ENABLED(CONFIG_POLL) && data->signal) {
96-
k_poll_signal_raise(data->signal, result);
95+
if (IS_ENABLED(CONFIG_POLL) && data->sig) {
96+
k_poll_signal_raise(data->sig, result);
9797
}
9898

9999
return;
@@ -246,8 +246,8 @@ static int video_mcux_csi_flush(const struct device *dev, bool cancel)
246246

247247
while ((vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT))) {
248248
k_fifo_put(&data->fifo_out, vbuf);
249-
if (IS_ENABLED(CONFIG_POLL) && data->signal) {
250-
k_poll_signal_raise(data->signal, VIDEO_BUF_ABORTED);
249+
if (IS_ENABLED(CONFIG_POLL) && data->sig) {
250+
k_poll_signal_raise(data->sig, VIDEO_BUF_ABORTED);
251251
}
252252
}
253253
}
@@ -371,15 +371,15 @@ static int video_mcux_csi_init(const struct device *dev)
371371
}
372372

373373
#ifdef CONFIG_POLL
374-
static int video_mcux_csi_set_signal(const struct device *dev, struct k_poll_signal *signal)
374+
static int video_mcux_csi_set_signal(const struct device *dev, struct k_poll_signal *sig)
375375
{
376376
struct video_mcux_csi_data *data = dev->data;
377377

378-
if (data->signal && signal != NULL) {
378+
if (data->sig && sig != NULL) {
379379
return -EALREADY;
380380
}
381381

382-
data->signal = signal;
382+
data->sig = sig;
383383

384384
return 0;
385385
}

drivers/video/video_sw_generator.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ struct video_sw_generator_data {
4040
struct k_work_delayable buf_work;
4141
struct k_work_sync work_sync;
4242
int pattern;
43-
struct k_poll_signal *signal;
43+
struct k_poll_signal *sig;
4444
uint32_t frame_rate;
4545
};
4646

@@ -163,8 +163,8 @@ static void __buffer_work(struct k_work *work)
163163

164164
k_fifo_put(&data->fifo_out, vbuf);
165165

166-
if (IS_ENABLED(CONFIG_POLL) && data->signal) {
167-
k_poll_signal_raise(data->signal, VIDEO_BUF_DONE);
166+
if (IS_ENABLED(CONFIG_POLL) && data->sig) {
167+
k_poll_signal_raise(data->sig, VIDEO_BUF_DONE);
168168
}
169169

170170
k_yield();
@@ -205,8 +205,8 @@ static int video_sw_generator_flush(const struct device *dev, bool cancel)
205205
} else {
206206
while ((vbuf = k_fifo_get(&data->fifo_in, K_NO_WAIT))) {
207207
k_fifo_put(&data->fifo_out, vbuf);
208-
if (IS_ENABLED(CONFIG_POLL) && data->signal) {
209-
k_poll_signal_raise(data->signal, VIDEO_BUF_ABORTED);
208+
if (IS_ENABLED(CONFIG_POLL) && data->sig) {
209+
k_poll_signal_raise(data->sig, VIDEO_BUF_ABORTED);
210210
}
211211
}
212212
}
@@ -226,15 +226,15 @@ static int video_sw_generator_get_caps(const struct device *dev, struct video_ca
226226
}
227227

228228
#ifdef CONFIG_POLL
229-
static int video_sw_generator_set_signal(const struct device *dev, struct k_poll_signal *signal)
229+
static int video_sw_generator_set_signal(const struct device *dev, struct k_poll_signal *sig)
230230
{
231231
struct video_sw_generator_data *data = dev->data;
232232

233-
if (data->signal && signal != NULL) {
233+
if (data->sig && sig != NULL) {
234234
return -EALREADY;
235235
}
236236

237-
data->signal = signal;
237+
data->sig = sig;
238238

239239
return 0;
240240
}

include/zephyr/drivers/video.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ typedef int (*video_api_get_caps_t)(const struct device *dev, struct video_caps
341341
*
342342
* See video_set_signal() for argument descriptions.
343343
*/
344-
typedef int (*video_api_set_signal_t)(const struct device *dev, struct k_poll_signal *signal);
344+
typedef int (*video_api_set_signal_t)(const struct device *dev, struct k_poll_signal *sig);
345345

346346
__subsystem struct video_driver_api {
347347
/* mandatory callbacks */
@@ -706,19 +706,19 @@ void video_print_ctrl(const struct device *const dev, const struct video_ctrl_qu
706706
* unregisters any previously registered signal.
707707
*
708708
* @param dev Pointer to the device structure for the driver instance.
709-
* @param signal Pointer to k_poll_signal
709+
* @param sig Pointer to k_poll_signal
710710
*
711711
* @retval 0 Is successful, -ERRNO code otherwise.
712712
*/
713-
static inline int video_set_signal(const struct device *dev, struct k_poll_signal *signal)
713+
static inline int video_set_signal(const struct device *dev, struct k_poll_signal *sig)
714714
{
715715
const struct video_driver_api *api = (const struct video_driver_api *)dev->api;
716716

717717
if (api->set_signal == NULL) {
718718
return -ENOSYS;
719719
}
720720

721-
return api->set_signal(dev, signal);
721+
return api->set_signal(dev, sig);
722722
}
723723

724724
/**

0 commit comments

Comments
 (0)