soc: mediatek: cmdq: remove OR opertaion from err return (01d1b408) · Commits · 戴 / test

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

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -149,13 +149,16 @@ int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
	u16 offset, u32 value, u32 mask)		u16 offset, u32 value, u32 mask)
	{		{
	u32 offset_mask = offset;		u32 offset_mask = offset;
	int err = 0;		int err;

	if (mask != 0xffffffff) {		if (mask != 0xffffffff) {
	err = cmdq_pkt_append_command(pkt, CMDQ_CODE_MASK, 0, ~mask);		err = cmdq_pkt_append_command(pkt, CMDQ_CODE_MASK, 0, ~mask);
			if (err < 0)
			return err;

	offset_mask \|= CMDQ_WRITE_ENABLE_MASK;		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;		return err;
	}		}
	@@ -197,9 +200,11 @@ static int cmdq_pkt_finalize(struct cmdq_pkt *pkt)

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

	/* JUMP to end */		/* 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;		return err;
	}		}