From 0ca0145bd02a0218111f1ebe420648c20265920e Mon Sep 17 00:00:00 2001 From: "jiejing.wang" Date: Mon, 22 Oct 2018 19:05:23 +0800 Subject: [PATCH] audio: fix errors of coverity [1/1] PD#166793 Problem: coverity check errors of format Solution: fix err Verify: verify locally Change-Id: Ie3a404fe50c5bdaa6a9cf4a4194659502defdbd2 Signed-off-by: jiejing.wang --- sound/soc/amlogic/auge/iomap.c | 17 +++++++++-------- sound/soc/amlogic/meson/meson.c | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sound/soc/amlogic/auge/iomap.c b/sound/soc/amlogic/auge/iomap.c index f1e3513..f3aa05e 100644 --- a/sound/soc/amlogic/auge/iomap.c +++ b/sound/soc/amlogic/auge/iomap.c @@ -29,7 +29,7 @@ static void __iomem *aml_snd_reg_map[IO_MAX]; static int aml_snd_read(u32 base_type, unsigned int reg, unsigned int *val) { - if ((base_type >= IO_PDM_BUS) && (base_type < IO_MAX)) { + if (base_type < IO_MAX) { *val = readl((aml_snd_reg_map[base_type] + (reg << 2))); return 0; @@ -41,7 +41,7 @@ static int aml_snd_read(u32 base_type, unsigned int reg, unsigned int *val) static void aml_snd_write(u32 base_type, unsigned int reg, unsigned int val) { - if ((base_type >= IO_PDM_BUS) && (base_type < IO_MAX)) { + if (base_type < IO_MAX) { writel(val, (aml_snd_reg_map[base_type] + (reg << 2))); return; @@ -54,15 +54,16 @@ static void aml_snd_update_bits(u32 base_type, unsigned int reg, unsigned int mask, unsigned int val) { - if ((base_type >= IO_PDM_BUS) && (base_type < IO_MAX)) { + if (base_type < IO_MAX) { unsigned int tmp, orig; - aml_snd_read(base_type, reg, &orig); - tmp = orig & ~mask; - tmp |= val & mask; - aml_snd_write(base_type, reg, tmp); + if (aml_snd_read(base_type, reg, &orig) == 0) { + tmp = orig & ~mask; + tmp |= val & mask; + aml_snd_write(base_type, reg, tmp); - return; + return; + } } pr_err("write snd reg %x error\n", reg); diff --git a/sound/soc/amlogic/meson/meson.c b/sound/soc/amlogic/meson/meson.c index eb32128..cbb1f13 100644 --- a/sound/soc/amlogic/meson/meson.c +++ b/sound/soc/amlogic/meson/meson.c @@ -683,19 +683,19 @@ static int aml_card_dais_parse_of(struct snd_soc_card *card) init = NULL; /* CPU sub-node */ cpu_node = of_parse_phandle(np, "cpu_list", i); - if (cpu_node < 0) { + if (!cpu_node) { dev_err(dev, "parse aml sound card cpu list error\n"); return -EINVAL; } /* CODEC sub-node */ codec_node = of_parse_phandle(np, "codec_list", i); - if (codec_node < 0) { + if (!codec_node) { dev_err(dev, "parse aml sound card codec list error\n"); return ret; } /* Platform sub-node */ plat_node = of_parse_phandle(np, "plat_list", i); - if (plat_node < 0) { + if (!plat_node) { dev_err(dev, "parse aml sound card platform list error\n"); return ret; -- 2.7.4