Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mohammed Anees and committed by
Hans Verkuil
27dcdb63 40384c84

+6 -16
+6 -16
drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
··· 114 114 if (pp_idx >= mdp->mdp_data->pp_used) 115 115 goto err_param; 116 116 117 - if (CFG_CHECK(MT8183, p_id)) 117 + if (CFG_CHECK(MT8183, p_id)) { 118 118 cfg_c = CFG_OFST(MT8183, param->config, pp_idx); 119 - else if (CFG_CHECK(MT8195, p_id)) 120 - cfg_c = CFG_OFST(MT8195, param->config, pp_idx); 121 - else 122 - goto err_param; 123 - 124 - if (CFG_CHECK(MT8183, p_id)) 125 119 cfg_n = CFG_OFST(MT8183, param->config, pp_idx + 1); 126 - else if (CFG_CHECK(MT8195, p_id)) 120 + } else if (CFG_CHECK(MT8195, p_id)) { 121 + cfg_c = CFG_OFST(MT8195, param->config, pp_idx); 127 122 cfg_n = CFG_OFST(MT8195, param->config, pp_idx + 1); 128 - else 123 + } else { 129 124 goto err_param; 125 + } 130 126 131 127 if ((long)cfg_n - (long)mdp->vpu.config > bound) { 132 128 dev_err(dev, "config offset %ld OOB %ld\n", (long)cfg_n, bound); ··· 603 607 goto err_uninit; 604 608 } 605 609 606 - if (CFG_CHECK(MT8183, p_id)) 607 - num_comp = CFG_GET(MT8183, config, num_components); 608 - else if (CFG_CHECK(MT8195, p_id)) 609 - num_comp = CFG_GET(MT8195, config, num_components); 610 - else 611 - goto err_uninit; 612 - 613 610 cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); 614 611 if (!cmd) { 615 612 ret = -ENOMEM; ··· 621 632 ret = -EINVAL; 622 633 goto err_destroy_pkt; 623 634 } 635 + 624 636 comps = kcalloc(num_comp, sizeof(*comps), GFP_KERNEL); 625 637 if (!comps) { 626 638 ret = -ENOMEM;