Re: [PATCH 09/35] media: v4l: async: refactor v4l2_async_create_ancillary_links

Dan Carpenter
2024-04-16T07:44:29Z

On Mon, Apr 15, 2024 at 07:34:26PM +0000, Ricardo Ribalda wrote:
> 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 <ribalda@chromium.org>
> ---
> 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 4bb073587817..e26a011c89c4 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;
>

I think another way you could write this is to remove the #ifs...

struct media_link *link;

if (!IS_ENABLED(CONFIG_MEDIA_CONTROLLER))
return 0;

if (sd->entity.function != MEDIA_ENT_F_LENS && ...

regards,
dan carpenter

> 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(&n->sd->entity, &sd->entity);
>
> -#endif
> -
> return IS_ERR(link) ? PTR_ERR(link) : 0;
> +#else
> + return 0;
> +#endif
> }
>