media: platform: mtk-mdp3: cmdq: Remove duplicated platforms checks

The platform compatibility checks for MT8183 and
MT8195 in mdp_cmdq_prepare() are redundant as they are
done in __get_config_offset() itself. Furthermore
there are two if-else branch in __get_config_offset()
which have similar conditions and are redundant.
To address this, remove the check in mdp_cmdq_prepare()
and combine the two if-else branch into one in
__get_config_offset().

Signed-off-by: Mohammed Anees <pvmohammedanees2003@gmail.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
index ea2ea119dd2a66bc2e3d4385e8a50a8d7656ffee..df0ab338ef41c0304f3672bf7f276a203e225cec 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
@@ -114,19 +114,15 @@ static struct img_config *__get_config_offset(struct mdp_dev *mdp,
        if (pp_idx >= mdp->mdp_data->pp_used)
                goto err_param;
 
-       if (CFG_CHECK(MT8183, p_id))
+       if (CFG_CHECK(MT8183, p_id)) {
                cfg_c = CFG_OFST(MT8183, param->config, pp_idx);
-       else if (CFG_CHECK(MT8195, p_id))
-               cfg_c = CFG_OFST(MT8195, param->config, pp_idx);
-       else
-               goto err_param;
-
-       if (CFG_CHECK(MT8183, p_id))
                cfg_n = CFG_OFST(MT8183, param->config, pp_idx + 1);
-       else if (CFG_CHECK(MT8195, p_id))
+       } else if (CFG_CHECK(MT8195, p_id)) {
+               cfg_c = CFG_OFST(MT8195, param->config, pp_idx);
                cfg_n = CFG_OFST(MT8195, param->config, pp_idx + 1);
-       else
+       } else {
                goto err_param;
+       }
 
        if ((long)cfg_n - (long)mdp->vpu.config > bound) {
                dev_err(dev, "config offset %ld OOB %ld\n", (long)cfg_n, bound);
@@ -607,13 +603,6 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct mdp_dev *mdp,
                goto err_uninit;
        }
 
-       if (CFG_CHECK(MT8183, p_id))
-               num_comp = CFG_GET(MT8183, config, num_components);
-       else if (CFG_CHECK(MT8195, p_id))
-               num_comp = CFG_GET(MT8195, config, num_components);
-       else
-               goto err_uninit;
-
        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
        if (!cmd) {
                ret = -ENOMEM;
@@ -632,6 +621,7 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct mdp_dev *mdp,
                ret = -EINVAL;
                goto err_destroy_pkt;
        }
+
        comps = kcalloc(num_comp, sizeof(*comps), GFP_KERNEL);
        if (!comps) {
                ret = -ENOMEM;