| Message ID | 20230216130021.64875-6-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | soc/mediatek: Cleanup mmsys, mutex, cmdq header | expand |
On Thu, Feb 16, 2023 at 9:02 PM AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> wrote: > > Compress entries of the of_match_mtk_mmsys array to reduce the amount > of lines and increase readability; this brings us to a maximum of 95 > columns. > > While at it, also add a sentinel comment to the last entry for the > sole purpose of consistency. > > This commit brings no functional changes. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/soc/mediatek/mtk-mutex.c | 38 +++++++++++--------------------- > 1 file changed, 13 insertions(+), 25 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c > index c5b1b42303ac..5c875139425c 100644 > --- a/drivers/soc/mediatek/mtk-mutex.c > +++ b/drivers/soc/mediatek/mtk-mutex.c > @@ -921,31 +921,19 @@ static int mtk_mutex_probe(struct platform_device *pdev) > } > > static const struct of_device_id mutex_driver_dt_match[] = { > - { .compatible = "mediatek,mt2701-disp-mutex", > - .data = &mt2701_mutex_driver_data}, > - { .compatible = "mediatek,mt2712-disp-mutex", > - .data = &mt2712_mutex_driver_data}, > - { .compatible = "mediatek,mt6795-disp-mutex", > - .data = &mt6795_mutex_driver_data}, > - { .compatible = "mediatek,mt8167-disp-mutex", > - .data = &mt8167_mutex_driver_data}, > - { .compatible = "mediatek,mt8173-disp-mutex", > - .data = &mt8173_mutex_driver_data}, > - { .compatible = "mediatek,mt8183-disp-mutex", > - .data = &mt8183_mutex_driver_data}, > - { .compatible = "mediatek,mt8186-disp-mutex", > - .data = &mt8186_mutex_driver_data}, > - { .compatible = "mediatek,mt8186-mdp3-mutex", > - .data = &mt8186_mdp_mutex_driver_data}, > - { .compatible = "mediatek,mt8188-disp-mutex", > - .data = &mt8188_mutex_driver_data}, > - { .compatible = "mediatek,mt8192-disp-mutex", > - .data = &mt8192_mutex_driver_data}, > - { .compatible = "mediatek,mt8195-disp-mutex", > - .data = &mt8195_mutex_driver_data}, This conflicts with the MT8195 VPP mutex patch already in Matthias's temporary branch: http://git.kernel.org/matthias.bgg/h/v6.3-tmp/soc ChenYu
diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mutex.c index c5b1b42303ac..5c875139425c 100644 --- a/drivers/soc/mediatek/mtk-mutex.c +++ b/drivers/soc/mediatek/mtk-mutex.c @@ -921,31 +921,19 @@ static int mtk_mutex_probe(struct platform_device *pdev) } static const struct of_device_id mutex_driver_dt_match[] = { - { .compatible = "mediatek,mt2701-disp-mutex", - .data = &mt2701_mutex_driver_data}, - { .compatible = "mediatek,mt2712-disp-mutex", - .data = &mt2712_mutex_driver_data}, - { .compatible = "mediatek,mt6795-disp-mutex", - .data = &mt6795_mutex_driver_data}, - { .compatible = "mediatek,mt8167-disp-mutex", - .data = &mt8167_mutex_driver_data}, - { .compatible = "mediatek,mt8173-disp-mutex", - .data = &mt8173_mutex_driver_data}, - { .compatible = "mediatek,mt8183-disp-mutex", - .data = &mt8183_mutex_driver_data}, - { .compatible = "mediatek,mt8186-disp-mutex", - .data = &mt8186_mutex_driver_data}, - { .compatible = "mediatek,mt8186-mdp3-mutex", - .data = &mt8186_mdp_mutex_driver_data}, - { .compatible = "mediatek,mt8188-disp-mutex", - .data = &mt8188_mutex_driver_data}, - { .compatible = "mediatek,mt8192-disp-mutex", - .data = &mt8192_mutex_driver_data}, - { .compatible = "mediatek,mt8195-disp-mutex", - .data = &mt8195_mutex_driver_data}, - { .compatible = "mediatek,mt8365-disp-mutex", - .data = &mt8365_mutex_driver_data}, - {}, + { .compatible = "mediatek,mt2701-disp-mutex", .data = &mt2701_mutex_driver_data }, + { .compatible = "mediatek,mt2712-disp-mutex", .data = &mt2712_mutex_driver_data }, + { .compatible = "mediatek,mt6795-disp-mutex", .data = &mt6795_mutex_driver_data }, + { .compatible = "mediatek,mt8167-disp-mutex", .data = &mt8167_mutex_driver_data }, + { .compatible = "mediatek,mt8173-disp-mutex", .data = &mt8173_mutex_driver_data }, + { .compatible = "mediatek,mt8183-disp-mutex", .data = &mt8183_mutex_driver_data }, + { .compatible = "mediatek,mt8186-disp-mutex", .data = &mt8186_mutex_driver_data }, + { .compatible = "mediatek,mt8186-mdp3-mutex", .data = &mt8186_mdp_mutex_driver_data }, + { .compatible = "mediatek,mt8188-disp-mutex", .data = &mt8188_mutex_driver_data }, + { .compatible = "mediatek,mt8192-disp-mutex", .data = &mt8192_mutex_driver_data }, + { .compatible = "mediatek,mt8195-disp-mutex", .data = &mt8195_mutex_driver_data }, + { .compatible = "mediatek,mt8365-disp-mutex", .data = &mt8365_mutex_driver_data }, + { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, mutex_driver_dt_match);
Compress entries of the of_match_mtk_mmsys array to reduce the amount of lines and increase readability; this brings us to a maximum of 95 columns. While at it, also add a sentinel comment to the last entry for the sole purpose of consistency. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/soc/mediatek/mtk-mutex.c | 38 +++++++++++--------------------- 1 file changed, 13 insertions(+), 25 deletions(-)