media: platform: mtk-mdp3: Remove mask parameter from MM_REG_POLL macro

Just like was done with MM_REG_WRITE, remove the mask from the
MM_REG_POLL macro, leaving MM_REG_POLL_MASK to be used when a mask is
required, and update the call sites accordingly. In this case, all calls
require a mask, so MM_REG_POLL remains unused, but at least this makes
the MM_REG_POLL macros consistent with the MM_REG_WRITE ones.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
index beb29ad0b048f18ff05d5c8d3876d7aa630ea3f5..683c066ed97586a187f7d30191ba0f6c99c83371 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
@@ -78,7 +78,7 @@ static int init_rdma(struct mdp_comp_ctx *ctx, struct mdp_cmdq_cmd *cmd)
 
        /* Reset RDMA */
        MM_REG_WRITE_MASK(cmd, subsys_id, base, MDP_RDMA_RESET, BIT(0), BIT(0));
-       MM_REG_POLL(cmd, subsys_id, base, MDP_RDMA_MON_STA_1, BIT(8), BIT(8));
+       MM_REG_POLL_MASK(cmd, subsys_id, base, MDP_RDMA_MON_STA_1, BIT(8), BIT(8));
        MM_REG_WRITE_MASK(cmd, subsys_id, base, MDP_RDMA_RESET, 0x0, BIT(0));
        return 0;
 }
@@ -634,14 +634,14 @@ static int init_wrot(struct mdp_comp_ctx *ctx, struct mdp_cmdq_cmd *cmd)
 
        /* Reset WROT */
        MM_REG_WRITE_MASK(cmd, subsys_id, base, VIDO_SOFT_RST, BIT(0), BIT(0));
-       MM_REG_POLL(cmd, subsys_id, base, VIDO_SOFT_RST_STAT, BIT(0), BIT(0));
+       MM_REG_POLL_MASK(cmd, subsys_id, base, VIDO_SOFT_RST_STAT, BIT(0), BIT(0));
 
        /* Reset setting */
        if (CFG_CHECK(MT8195, p_id))
                MM_REG_WRITE(cmd, subsys_id, base, VIDO_CTRL, 0x0);
 
        MM_REG_WRITE_MASK(cmd, subsys_id, base, VIDO_SOFT_RST, 0x0, BIT(0));
-       MM_REG_POLL(cmd, subsys_id, base, VIDO_SOFT_RST_STAT, 0x0, BIT(0));
+       MM_REG_POLL_MASK(cmd, subsys_id, base, VIDO_SOFT_RST_STAT, 0x0, BIT(0));
        return 0;
 }
 
@@ -871,7 +871,7 @@ static int init_wdma(struct mdp_comp_ctx *ctx, struct mdp_cmdq_cmd *cmd)
 
        /* Reset WDMA */
        MM_REG_WRITE_MASK(cmd, subsys_id, base, WDMA_RST, BIT(0), BIT(0));
-       MM_REG_POLL(cmd, subsys_id, base, WDMA_FLOW_CTRL_DBG, BIT(0), BIT(0));
+       MM_REG_POLL_MASK(cmd, subsys_id, base, WDMA_FLOW_CTRL_DBG, BIT(0), BIT(0));
        MM_REG_WRITE_MASK(cmd, subsys_id, base, WDMA_RST, 0x0, BIT(0));
        return 0;
 }

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
index 902006d7c4baafe2c326e42d2ee6dfca0acf0aa8..681906c164194228c460bd6d26d5a625112b232b 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
@@ -53,16 +53,13 @@ do {                                                                \
 do {                                                           \
        typeof(_mask) (_m) = (_mask);                           \
        cmdq_pkt_poll_mask(&((cmd)->pkt), id,                   \
-               (base) + (ofst), (val), (_m));                  \
+               (base) + (ofst), (val),                         \
+               (((_m) & (ofst##_MASK)) == (ofst##_MASK)) ?     \
+                       (0xffffffff) : (_m));                   \
 } while (0)
 
-#define MM_REG_POLL(cmd, id, base, ofst, val, mask)            \
-do {                                                           \
-       typeof(mask) (m) = (mask);                              \
-       MM_REG_POLL_MASK((cmd), id, base, ofst, val,            \
-               (((m) & (ofst##_MASK)) == (ofst##_MASK)) ?      \
-                       (0xffffffff) : (m));                    \
-} while (0)
+#define MM_REG_POLL(cmd, id, base, ofst, val)                  \
+       cmdq_pkt_poll(&((cmd)->pkt), id, (base) + (ofst), (val))
 
 enum mtk_mdp_comp_id {
        MDP_COMP_NONE = -1,     /* Invalid engine */