openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: vsp1: video: Fix coding style 

Commit 54b5a749b4 ("[media] v4l: vsp1: Use media entity enumeration
interface") wasn't aligned with the driver coding style. Fix it by
renaming the rval variable to ret.

Furthermore shorten lines by accessing the media_device instance in a
more straightforward fashion.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Laurent Pinchart 2016-02-28 23:28:38 -03:00 committed by Mauro Carvalho Chehab
parent c1741af7d1
commit 6b1446bc7c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/platform/vsp1/vsp1_video.c
View File

@ -175,31 +175,30 @@ static int vsp1_video_pipeline_validate_branch(struct vsp1_pipeline *pipe,
struct vsp1_rwpf *input, struct vsp1_rwpf *input,
struct vsp1_rwpf *output) struct vsp1_rwpf *output)
{ {
struct vsp1_entity *entity;
struct media_entity_enum ent_enum; struct media_entity_enum ent_enum;
struct vsp1_entity *entity;
struct media_pad *pad; struct media_pad *pad;
int rval;
bool bru_found = false; bool bru_found = false;
int ret;
input->location.left = 0; input->location.left = 0;
input->location.top = 0; input->location.top = 0;
rval = media_entity_enum_init( ret = media_entity_enum_init(&ent_enum, &input->entity.vsp1->media_dev);
&ent_enum, input->entity.pads[RWPF_PAD_SOURCE].graph_obj.mdev); if (ret < 0)
if (rval) return ret;
return rval;
pad = media_entity_remote_pad(&input->entity.pads[RWPF_PAD_SOURCE]); pad = media_entity_remote_pad(&input->entity.pads[RWPF_PAD_SOURCE]);
while (1) { while (1) {
if (pad == NULL) { if (pad == NULL) {
rval = -EPIPE; ret = -EPIPE;
goto out; goto out;
} }
/* We've reached a video node, that shouldn't have happened. */ /* We've reached a video node, that shouldn't have happened. */
if (!is_media_entity_v4l2_subdev(pad->entity)) { if (!is_media_entity_v4l2_subdev(pad->entity)) {
rval = -EPIPE; ret = -EPIPE;
goto out; goto out;
} }
@ -229,14 +228,14 @@ static int vsp1_video_pipeline_validate_branch(struct vsp1_pipeline *pipe,
/* Ensure the branch has no loop. */ /* Ensure the branch has no loop. */
if (media_entity_enum_test_and_set(&ent_enum, if (media_entity_enum_test_and_set(&ent_enum,
&entity->subdev.entity)) { &entity->subdev.entity)) {
rval = -EPIPE; ret = -EPIPE;
goto out; goto out;
} }
/* UDS can't be chained. */ /* UDS can't be chained. */
if (entity->type == VSP1_ENTITY_UDS) { if (entity->type == VSP1_ENTITY_UDS) {
if (pipe->uds) { if (pipe->uds) {
rval = -EPIPE; ret = -EPIPE;
goto out; goto out;
} }
@ -256,12 +255,12 @@ static int vsp1_video_pipeline_validate_branch(struct vsp1_pipeline *pipe,
/* The last entity must be the output WPF. */ /* The last entity must be the output WPF. */
if (entity != &output->entity) if (entity != &output->entity)
rval = -EPIPE; ret = -EPIPE;
out: out:
media_entity_enum_cleanup(&ent_enum); media_entity_enum_cleanup(&ent_enum);
return rval; return ret;
} }
static int vsp1_video_pipeline_validate(struct vsp1_pipeline *pipe, static int vsp1_video_pipeline_validate(struct vsp1_pipeline *pipe,