Commit 2c7f7a3b authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Hans Verkuil
Browse files

media: v4l: async: refactor v4l2_async_create_ancillary_links 



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: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 8a09bb1b

drivers/media/v4l2-core/v4l2-async.c

+4 −4
Original line number Diff line number Diff line
@@ -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(&n->sd->entity, &sd->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,