From afa5d19a2b5fbf0bbcce34f3613bce2bc9479bb7 Mon Sep 17 00:00:00 2001 From: Thaissa Falbo Date: Thu, 18 Feb 2016 14:18:12 -0200 Subject: [PATCH] staging: media: davinci_vpfe: remove unnecessary ret variable Simplified return of funcions by removing assignment of ret variable. Coccinelle script used: @@ local idexpression ret; expression e; @@ - ret = e; - if(ret) - return ret; + if(e) + return e; @@ local idexpression ret; expression e; @@ - ret = e; - return ret; + return e; @@ local idexpression ret; expression e; @@ - ret = e; - if(ret){ + if(e){ ... when != ret - return ret; + return e; } @@ type T; identifier i; @@ - T i; ... when != i Signed-off-by: Thaissa Falbo Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/davinci_vpfe/vpfe_video.c | 54 +++++++++---------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 7f0e423..0a65405 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -172,11 +172,9 @@ static int vpfe_prepare_pipeline(struct vpfe_video_device *video) static int vpfe_update_pipe_state(struct vpfe_video_device *video) { struct vpfe_pipeline *pipe = &video->pipe; - int ret; - ret = vpfe_prepare_pipeline(video); - if (ret) - return ret; + if (vpfe_prepare_pipeline(video)) + return vpfe_prepare_pipeline(video); /* * Find out if there is any input video @@ -184,10 +182,9 @@ static int vpfe_update_pipe_state(struct vpfe_video_device *video) */ if (pipe->input_num == 0) { pipe->state = VPFE_PIPELINE_STREAM_CONTINUOUS; - ret = vpfe_update_current_ext_subdev(video); - if (ret) { + if (vpfe_update_current_ext_subdev(video)) { pr_err("Invalid external subdev\n"); - return ret; + return vpfe_update_current_ext_subdev(video); } } else { pipe->state = VPFE_PIPELINE_STREAM_SINGLESHOT; @@ -670,7 +667,6 @@ static int vpfe_enum_fmt(struct file *file, void *priv, struct v4l2_subdev *subdev; struct v4l2_format format; struct media_pad *remote; - int ret; v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_enum_fmt\n"); @@ -699,11 +695,10 @@ static int vpfe_enum_fmt(struct file *file, void *priv, sd_fmt.pad = remote->index; sd_fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; /* get output format of remote subdev */ - ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &sd_fmt); - if (ret) { + if (v4l2_subdev_call(subdev, pad, get_fmt, NULL, &sd_fmt)) { v4l2_err(&vpfe_dev->v4l2_dev, "invalid remote subdev for video node\n"); - return ret; + return v4l2_subdev_call(subdev, pad, get_fmt, NULL, &sd_fmt); } /* convert to pix format */ mbus.code = sd_fmt.format.code; @@ -730,7 +725,6 @@ static int vpfe_s_fmt(struct file *file, void *priv, struct vpfe_video_device *video = video_drvdata(file); struct vpfe_device *vpfe_dev = video->vpfe_dev; struct v4l2_format format; - int ret; v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_fmt\n"); /* If streaming is started, return error */ @@ -739,9 +733,8 @@ static int vpfe_s_fmt(struct file *file, void *priv, return -EBUSY; } /* get adjacent subdev's output pad format */ - ret = __vpfe_video_get_format(video, &format); - if (ret) - return ret; + if (__vpfe_video_get_format(video, &format)) + return __vpfe_video_get_format(video, &format); *fmt = format; video->fmt = *fmt; return 0; @@ -764,13 +757,11 @@ static int vpfe_try_fmt(struct file *file, void *priv, struct vpfe_video_device *video = video_drvdata(file); struct vpfe_device *vpfe_dev = video->vpfe_dev; struct v4l2_format format; - int ret; v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_try_fmt\n"); /* get adjacent subdev's output pad format */ - ret = __vpfe_video_get_format(video, &format); - if (ret) - return ret; + if (__vpfe_video_get_format(video, &format)) + return __vpfe_video_get_format(video, &format); *fmt = format; return 0; @@ -847,9 +838,8 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index) v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_input\n"); - ret = mutex_lock_interruptible(&video->lock); - if (ret) - return ret; + if (mutex_lock_interruptible(&video->lock)) + return mutex_lock_interruptible(&video->lock); /* * If streaming is started return device busy * error @@ -950,9 +940,8 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id) v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_s_std\n"); /* Call decoder driver function to set the standard */ - ret = mutex_lock_interruptible(&video->lock); - if (ret) - return ret; + if (mutex_lock_interruptible(&video->lock)) + return mutex_lock_interruptible(&video->lock); sdinfo = video->current_ext_subdev; /* If streaming is started, return device busy error */ if (video->started) { @@ -1338,9 +1327,8 @@ static int vpfe_reqbufs(struct file *file, void *priv, return -EINVAL; } - ret = mutex_lock_interruptible(&video->lock); - if (ret) - return ret; + if (mutex_lock_interruptible(&video->lock)) + return mutex_lock_interruptible(&video->lock); if (video->io_usrs != 0) { v4l2_err(&vpfe_dev->v4l2_dev, "Only one IO user allowed\n"); @@ -1366,11 +1354,10 @@ static int vpfe_reqbufs(struct file *file, void *priv, q->buf_struct_size = sizeof(struct vpfe_cap_buffer); q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - ret = vb2_queue_init(q); - if (ret) { + if (vb2_queue_init(q)) { v4l2_err(&vpfe_dev->v4l2_dev, "vb2_queue_init() failed\n"); vb2_dma_contig_cleanup_ctx(vpfe_dev->pdev); - return ret; + return vb2_queue_init(q); } fh->io_allowed = 1; @@ -1546,9 +1533,8 @@ static int vpfe_streamoff(struct file *file, void *priv, return -EINVAL; } - ret = mutex_lock_interruptible(&video->lock); - if (ret) - return ret; + if (mutex_lock_interruptible(&video->lock)) + return mutex_lock_interruptible(&video->lock); vpfe_stop_capture(video); ret = vb2_streamoff(&video->buffer_queue, buf_type); -- 2.7.4