xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: staging: media: atomisp: pci: Balance braces around conditional statements in file atomisp_cmd.c

Browse Source 
[ Upstream commit 0a016c35a326c6b2f558ede58ff08da7ef1da1a8 ]

Balance braces around conditional statements.
Issue detected by checkpatch.pl.
It happens in if-else statements where one of the commands
uses braces around a block of code and the other command
does not since it has just a single line of code.

Signed-off-by: Aline Santana Cordeiro <alinesantanacordeiro@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Aline Santana Cordeiro
2021-04-15 18:54:23 +02:00
committed by Greg Kroah-Hartman
parent 22b0b68f7d
commit 6cbabad304
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/media/atomisp/pci/atomisp_cmd.c
View File

@@ -1138,9 +1138,10 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error,
asd->frame_status[vb->i] = asd->frame_status[vb->i] =
ATOMISP_FRAME_STATUS_OK; ATOMISP_FRAME_STATUS_OK;
} }
} else } else {
asd->frame_status[vb->i] = asd->frame_status[vb->i] =
ATOMISP_FRAME_STATUS_OK; ATOMISP_FRAME_STATUS_OK;
}
} else { } else {
asd->frame_status[vb->i] = ATOMISP_FRAME_STATUS_OK; asd->frame_status[vb->i] = ATOMISP_FRAME_STATUS_OK;
} }
@@ -4945,9 +4946,9 @@ atomisp_try_fmt_file(struct atomisp_device *isp, struct v4l2_format *f)
depth = get_pixel_depth(pixelformat); depth = get_pixel_depth(pixelformat);
if (field == V4L2_FIELD_ANY) if (field == V4L2_FIELD_ANY) {
field = V4L2_FIELD_NONE; field = V4L2_FIELD_NONE;
else if (field != V4L2_FIELD_NONE) { } else if (field != V4L2_FIELD_NONE) {
dev_err(isp->dev, "Wrong output field\n"); dev_err(isp->dev, "Wrong output field\n");
return -EINVAL; return -EINVAL;
} }
@@ -6587,17 +6588,17 @@ static int atomisp_get_pipe_id(struct atomisp_video_pipe *pipe)
{ {
struct atomisp_sub_device *asd = pipe->asd; struct atomisp_sub_device *asd = pipe->asd;
if (ATOMISP_USE_YUVPP(asd)) if (ATOMISP_USE_YUVPP(asd)) {
return IA_CSS_PIPE_ID_YUVPP; return IA_CSS_PIPE_ID_YUVPP;
else if (asd->vfpp->val == ATOMISP_VFPP_DISABLE_SCALER) } else if (asd->vfpp->val == ATOMISP_VFPP_DISABLE_SCALER) {
return IA_CSS_PIPE_ID_VIDEO; return IA_CSS_PIPE_ID_VIDEO;
else if (asd->vfpp->val == ATOMISP_VFPP_DISABLE_LOWLAT) } else if (asd->vfpp->val == ATOMISP_VFPP_DISABLE_LOWLAT) {
return IA_CSS_PIPE_ID_CAPTURE; return IA_CSS_PIPE_ID_CAPTURE;
else if (pipe == &asd->video_out_video_capture) } else if (pipe == &asd->video_out_video_capture) {
return IA_CSS_PIPE_ID_VIDEO; return IA_CSS_PIPE_ID_VIDEO;
else if (pipe == &asd->video_out_vf) } else if (pipe == &asd->video_out_vf) {
return IA_CSS_PIPE_ID_CAPTURE; return IA_CSS_PIPE_ID_CAPTURE;
else if (pipe == &asd->video_out_preview) { } else if (pipe == &asd->video_out_preview) {
if (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO) if (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO)
return IA_CSS_PIPE_ID_VIDEO; return IA_CSS_PIPE_ID_VIDEO;
else else