Skip to content

Commit 01d1b40

Browse files
BibbyHsiehmbgg
authored andcommitted
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 <[email protected]> Reviewed-by: CK Hu <[email protected]> [mb: rephrase commit message] Signed-off-by: Matthias Brugger <[email protected]>
1 parent e42617b commit 01d1b40

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

drivers/soc/mediatek/mtk-cmdq-helper.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,16 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
149149
u16 offset, u32 value, u32 mask)
150150
{
151151
u32 offset_mask = offset;
152-
int err = 0;
152+
int err;
153153

154154
if (mask != 0xffffffff) {
155155
err = cmdq_pkt_append_command(pkt, CMDQ_CODE_MASK, 0, ~mask);
156+
if (err < 0)
157+
return err;
158+
156159
offset_mask |= CMDQ_WRITE_ENABLE_MASK;
157160
}
158-
err |= cmdq_pkt_write(pkt, subsys, offset_mask, value);
161+
err = cmdq_pkt_write(pkt, subsys, offset_mask, value);
159162

160163
return err;
161164
}
@@ -197,9 +200,11 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)
197200

198201
/* insert EOC and generate IRQ for each command iteration */
199202
err = cmdq_pkt_append_command(pkt, CMDQ_CODE_EOC, 0, CMDQ_EOC_IRQ_EN);
203+
if (err < 0)
204+
return err;
200205

201206
/* JUMP to end */
202-
err |= cmdq_pkt_append_command(pkt, CMDQ_CODE_JUMP, 0, CMDQ_JUMP_PASS);
207+
err = cmdq_pkt_append_command(pkt, CMDQ_CODE_JUMP, 0, CMDQ_JUMP_PASS);
203208

204209
return err;
205210
}

0 commit comments

Comments
 (0)