From 802a76031bd7555d09dc7926b0799b113dcda652 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 2 Aug 2022 09:40:14 +0800 Subject: [PATCH] media: rockchip: cif: Remove unnecessary test 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 Change-Id: I03baf193ffb51e2c23d3e115dbc44cc564e57dca --- drivers/media/platform/rockchip/cif/dev.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/dev.c b/drivers/media/platform/rockchip/cif/dev.c index 0ae598b92392..454492c09d5c 100644 --- a/drivers/media/platform/rockchip/cif/dev.c +++ b/drivers/media/platform/rockchip/cif/dev.c @@ -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,