shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: cif: Remove unnecessary test

Browse Source 
Fix the following smatch warnings:
drivers/media/platform/rockchip/cif/dev.c:610 rkcif_write_register() warn: we tested 'index' before and it was 'true'
drivers/media/platform/rockchip/cif/dev.c:638 rkcif_write_register_or() warn: we tested 'index' before and it was 'true'
drivers/media/platform/rockchip/cif/dev.c:669 rkcif_write_register_and() warn: we tested 'index' before and it was 'true'
drivers/media/platform/rockchip/cif/dev.c:700 rkcif_read_register() warn: we tested 'index' before and it was 'true'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I03baf193ffb51e2c23d3e115dbc44cc564e57dca
This commit is contained in:
Tao Huang
2022-08-02 09:40:14 +08:00
parent 2ddf5c9116
commit 802a76031b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/rockchip/cif/dev.c
View File

@@ -606,8 +606,7 @@ void rkcif_write_register(struct rkcif_device *dev,
csi_offset = dev->csi_host_idx * 0x200;
}
if (index < CIF_REG_INDEX_MAX) {
if (index == CIF_REG_DVP_CTRL ||
(index != CIF_REG_DVP_CTRL && reg->offset != 0x0))
if (index == CIF_REG_DVP_CTRL || reg->offset != 0x0)
write_cif_reg(base, reg->offset + csi_offset, val);
else
v4l2_dbg(1, rkcif_debug, &dev->v4l2_dev,
@@ -634,8 +633,7 @@ void rkcif_write_register_or(struct rkcif_device *dev,
}
if (index < CIF_REG_INDEX_MAX) {
if (index == CIF_REG_DVP_CTRL ||
(index != CIF_REG_DVP_CTRL && reg->offset != 0x0)) {
if (index == CIF_REG_DVP_CTRL || reg->offset != 0x0) {
reg_val = read_cif_reg(base, reg->offset + csi_offset);
reg_val |= val;
write_cif_reg(base, reg->offset + csi_offset, reg_val);
@@ -665,8 +663,7 @@ void rkcif_write_register_and(struct rkcif_device *dev,
}
if (index < CIF_REG_INDEX_MAX) {
if (index == CIF_REG_DVP_CTRL ||
(index != CIF_REG_DVP_CTRL && reg->offset != 0x0)) {
if (index == CIF_REG_DVP_CTRL || reg->offset != 0x0) {
reg_val = read_cif_reg(base, reg->offset + csi_offset);
reg_val &= val;
write_cif_reg(base, reg->offset + csi_offset, reg_val);
@@ -696,8 +693,7 @@ unsigned int rkcif_read_register(struct rkcif_device *dev,
}
if (index < CIF_REG_INDEX_MAX) {
if (index == CIF_REG_DVP_CTRL ||
(index != CIF_REG_DVP_CTRL && reg->offset != 0x0))
if (index == CIF_REG_DVP_CTRL || reg->offset != 0x0)
val = read_cif_reg(base, reg->offset + csi_offset);
else
v4l2_dbg(1, rkcif_debug, &dev->v4l2_dev,