From 497ac488900175ebd0036ce410de321a296f1d4c Mon Sep 17 00:00:00 2001 From: "changqing.gao" Date: Wed, 18 Sep 2019 13:41:05 +0800 Subject: [PATCH] iomap: fix coverity errors [1/1] PD#SWPL-13972 Problem: iomap Coverity errors. Solution: 1. remove verbose code. 2. check return value. Verify: test pass on tm2_ab301_v1 Change-Id: Ib8c2baaae63d3c6454ffa45a0c353a6dd9de0787 Signed-off-by: changqing.gao --- drivers/amlogic/iomap/iomap.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/amlogic/iomap/iomap.c b/drivers/amlogic/iomap/iomap.c index c6c0041..239183b 100644 --- a/drivers/amlogic/iomap/iomap.c +++ b/drivers/amlogic/iomap/iomap.c @@ -70,16 +70,20 @@ int aml_regmap_update_bits(u32 bus_type, unsigned int reg, unsigned int mask, unsigned int val) { - if (bus_type < IO_BUS_MAX && (meson_reg_map[bus_type] != NULL)) { - unsigned int tmp, orig; + int ret = 0; + unsigned int tmp, orig; - aml_reg_read(bus_type, reg, &orig); - tmp = orig & ~mask; - tmp |= val & mask; - aml_reg_write(bus_type, reg, tmp); - return 0; - } else - return -1; + ret = aml_reg_read(bus_type, reg, &orig); + if (ret) { + pr_err("read bus reg %x error %d\n", reg, ret); + return ret; + } + tmp = orig & ~mask; + tmp |= val & mask; + ret = aml_reg_write(bus_type, reg, tmp); + if (ret) + pr_err("write bus reg %x error %d\n", reg, ret); + return ret; } EXPORT_SYMBOL(aml_regmap_update_bits); -- 2.7.4