[git:media_stage/master] media: uvcvideo: Refactor iterators
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: uvcvideo: Refactor iterators
Author: Ricardo Ribalda
Date:Mon Apr 29 15:04:42 2024 +
Avoid using the iterators after the list_for_each() constructs.
This patch should be a NOP, but makes cocci, happier:
drivers/media/usb/uvc/uvc_ctrl.c:1861:44-50: ERROR: invalid reference to the
index variable of the iterator on line 1850
drivers/media/usb/uvc/uvc_ctrl.c:2195:17-23: ERROR: invalid reference to the
index variable of the iterator on line 2179
Reviewed-by: Sergey Senozhatsky
Reviewed-by: Laurent Pinchart
Signed-off-by: Ricardo Ribalda
Signed-off-by: Hans Verkuil
drivers/media/usb/uvc/uvc_ctrl.c | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index f8ae14b8b426..4b685f883e4d 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1850,16 +1850,18 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int
rollback,
list_for_each_entry(entity, >entities, chain) {
ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback,
_ctrl);
- if (ret < 0)
+ if (ret < 0) {
+ if (ctrls)
+ ctrls->error_idx =
+ uvc_ctrl_find_ctrl_idx(entity, ctrls,
+ err_ctrl);
goto done;
+ }
}
if (!rollback)
uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
done:
- if (ret < 0 && ctrls)
- ctrls->error_idx = uvc_ctrl_find_ctrl_idx(entity, ctrls,
- err_ctrl);
mutex_unlock(>ctrl_mutex);
return ret;
}
@@ -2165,7 +2167,7 @@ static int uvc_ctrl_init_xu_ctrl(struct uvc_device *dev,
int uvc_xu_ctrl_query(struct uvc_video_chain *chain,
struct uvc_xu_control_query *xqry)
{
- struct uvc_entity *entity;
+ struct uvc_entity *entity, *iter;
struct uvc_control *ctrl;
unsigned int i;
bool found;
@@ -2175,16 +2177,16 @@ int uvc_xu_ctrl_query(struct uvc_video_chain *chain,
int ret;
/* Find the extension unit. */
- found = false;
- list_for_each_entry(entity, >entities, chain) {
- if (UVC_ENTITY_TYPE(entity) == UVC_VC_EXTENSION_UNIT &&
- entity->id == xqry->unit) {
- found = true;
+ entity = NULL;
+ list_for_each_entry(iter, >entities, chain) {
+ if (UVC_ENTITY_TYPE(iter) == UVC_VC_EXTENSION_UNIT &&
+ iter->id == xqry->unit) {
+ entity = iter;
break;
}
}
- if (!found) {
+ if (!entity) {
uvc_dbg(chain->dev, CONTROL, "Extension unit %u not found\n",
xqry->unit);
return -ENOENT;
[git:media_stage/master] media: cec.h: Fix kerneldoc
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: cec.h: Fix kerneldoc
Author: Ricardo Ribalda
Date:Fri May 3 11:33:20 2024 +
is_claiming_log_addrs documentation was missing.
fix this kernel-doc warning:
include/media/cec.h:296: warning: Function parameter or struct member
'is_claiming_log_addrs' not described in 'cec_adapter'
Signed-off-by: Ricardo Ribalda
Reviewed-by: Hans Verkuil
Signed-off-by: Hans Verkuil
include/media/cec.h | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/include/media/cec.h b/include/media/cec.h
index d3abe84c9c9e..d131514032f2 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -187,6 +187,7 @@ struct cec_adap_ops {
* in order to transmit or receive CEC messages. This is usually a HW
* limitation.
* @is_enabled:the CEC adapter is enabled
+ * @is_claiming_log_addrs: true if cec_claim_log_addrs() is running
* @is_configuring:the CEC adapter is configuring (i.e. claiming LAs)
* @must_reconfigure: while configuring, the PA changed, so reclaim LAs
* @is_configured: the CEC adapter is configured (i.e. has claimed LAs)
[git:media_stage/master] media: v4l: async: refactor v4l2_async_create_ancillary_links
This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: v4l: async: refactor v4l2_async_create_ancillary_links
Author: Ricardo Ribalda
Date:Mon Apr 15 19:34:26 2024 +
Return 0 without checking IS_ERR or PTR_ERR if CONFIG_MEDIA_CONTROLLER
is not enabled.
This makes cocci happier:
drivers/media/v4l2-core/v4l2-async.c:331:23-30: ERROR: PTR_ERR applied after
initialization to constant on line 319
Signed-off-by: Ricardo Ribalda
Signed-off-by: Hans Verkuil
drivers/media/v4l2-core/v4l2-async.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/drivers/media/v4l2-core/v4l2-async.c
b/drivers/media/v4l2-core/v4l2-async.c
index 3a22da443a22..222f01665f7c 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -316,9 +316,8 @@ v4l2_async_nf_try_all_subdevs(struct v4l2_async_notifier
*notifier);
static int v4l2_async_create_ancillary_links(struct v4l2_async_notifier *n,
struct v4l2_subdev *sd)
{
- struct media_link *link = NULL;
-
#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
+ struct media_link *link;
if (sd->entity.function != MEDIA_ENT_F_LENS &&
sd->entity.function != MEDIA_ENT_F_FLASH)
@@ -326,9 +325,10 @@ static int v4l2_async_create_ancillary_links(struct
v4l2_async_notifier *n,
link = media_create_ancillary_link(>sd->entity, >entity);
-#endif
-
return IS_ERR(link) ? PTR_ERR(link) : 0;
+#else
+ return 0;
+#endif
}
static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
