soc: mediatek: cmdq: remove OR opertaion from err return

Debugging gets harder if we OR two error return values.
Return each error on it's own instead

Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
[mb: rephrase commit message]
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 3c82de5..c8fb697 100644 (file)
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -149,13 +149,16 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
                        u16 offset, u32 value, u32 mask)
 {
        u32 offset_mask = offset;
-       int err = 0;
+       int err;
 
        if (mask != 0xffffffff) {
                err = cmdq_pkt_append_command(pkt, CMDQ_CODE_MASK, 0, ~mask);
+               if (err < 0)
+                       return err;
+
                offset_mask |= CMDQ_WRITE_ENABLE_MASK;
        }
-       err |= cmdq_pkt_write(pkt, subsys, offset_mask, value);
+       err = cmdq_pkt_write(pkt, subsys, offset_mask, value);
 
        return err;
 }
@@ -197,9 +200,11 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
 
        /* insert EOC and generate IRQ for each command iteration */
        err = cmdq_pkt_append_command(pkt, CMDQ_CODE_EOC, 0, CMDQ_EOC_IRQ_EN);
+       if (err < 0)
+               return err;
 
        /* JUMP to end */
-       err |= cmdq_pkt_append_command(pkt, CMDQ_CODE_JUMP, 0, CMDQ_JUMP_PASS);
+       err = cmdq_pkt_append_command(pkt, CMDQ_CODE_JUMP, 0, CMDQ_JUMP_PASS);
 
        return err;
 }