| Message ID | 20220516124659.69484-6-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MediaTek PMIC Wrap improvements and cleanups | expand |
On 16/05/2022 14:46, AngeloGioacchino Del Regno wrote: > Compress each entry of the of_device_id tables in this driver to one > line instead of three, as they fit just fine in a single line. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/soc/mediatek/mtk-pmic-wrap.c | 90 ++++++++-------------------- > 1 file changed, 24 insertions(+), 66 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c > index 7d02e1d4faf4..c018092e6cbe 100644 > --- a/drivers/soc/mediatek/mtk-pmic-wrap.c > +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c > @@ -1960,33 +1960,17 @@ static const struct pwrap_slv_type pmic_mt6397 = { > }; > > static const struct of_device_id of_slave_match_tbl[] = { > - { > - .compatible = "mediatek,mt6323", > - .data = &pmic_mt6323, > - }, { > - .compatible = "mediatek,mt6351", > - .data = &pmic_mt6351, > - }, { > - .compatible = "mediatek,mt6357", > - .data = &pmic_mt6357, > - }, { > - .compatible = "mediatek,mt6358", > - .data = &pmic_mt6358, > - }, { > - .compatible = "mediatek,mt6359", > - .data = &pmic_mt6359, > - }, { > - /* The MT6380 PMIC only implements a regulator, so we bind it > - * directly instead of using a MFD. > - */ > - .compatible = "mediatek,mt6380-regulator", > - .data = &pmic_mt6380, > - }, { > - .compatible = "mediatek,mt6397", > - .data = &pmic_mt6397, > - }, { > - /* sentinel */ > - } > + { .compatible = "mediatek,mt6323", .data = &pmic_mt6323 }, > + { .compatible = "mediatek,mt6351", .data = &pmic_mt6351 }, > + { .compatible = "mediatek,mt6357", .data = &pmic_mt6357 }, > + { .compatible = "mediatek,mt6358", .data = &pmic_mt6358 }, > + { .compatible = "mediatek,mt6359", .data = &pmic_mt6359 }, > + /* The MT6380 PMIC only implements a regulator, so we bind it Nit-pick alert: new line here for readability. Regards, Matthias > + * directly instead of using a MFD. > + */ > + { .compatible = "mediatek,mt6380-regulator", .data = &pmic_mt6380 }, > + { .compatible = "mediatek,mt6397", .data = &pmic_mt6397 }, > + { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, of_slave_match_tbl); > > @@ -2145,45 +2129,19 @@ static struct pmic_wrapper_type pwrap_mt8186 = { > }; > > static const struct of_device_id of_pwrap_match_tbl[] = { > - { > - .compatible = "mediatek,mt2701-pwrap", > - .data = &pwrap_mt2701, > - }, { > - .compatible = "mediatek,mt6765-pwrap", > - .data = &pwrap_mt6765, > - }, { > - .compatible = "mediatek,mt6779-pwrap", > - .data = &pwrap_mt6779, > - }, { > - .compatible = "mediatek,mt6797-pwrap", > - .data = &pwrap_mt6797, > - }, { > - .compatible = "mediatek,mt6873-pwrap", > - .data = &pwrap_mt6873, > - }, { > - .compatible = "mediatek,mt7622-pwrap", > - .data = &pwrap_mt7622, > - }, { > - .compatible = "mediatek,mt8135-pwrap", > - .data = &pwrap_mt8135, > - }, { > - .compatible = "mediatek,mt8173-pwrap", > - .data = &pwrap_mt8173, > - }, { > - .compatible = "mediatek,mt8183-pwrap", > - .data = &pwrap_mt8183, > - }, { > - .compatible = "mediatek,mt8186-pwrap", > - .data = &pwrap_mt8186, > - }, { > - .compatible = "mediatek,mt8195-pwrap", > - .data = &pwrap_mt8195, > - }, { > - .compatible = "mediatek,mt8516-pwrap", > - .data = &pwrap_mt8516, > - }, { > - /* sentinel */ > - } > + { .compatible = "mediatek,mt2701-pwrap", .data = &pwrap_mt2701 }, > + { .compatible = "mediatek,mt6765-pwrap", .data = &pwrap_mt6765 }, > + { .compatible = "mediatek,mt6779-pwrap", .data = &pwrap_mt6779 }, > + { .compatible = "mediatek,mt6797-pwrap", .data = &pwrap_mt6797 }, > + { .compatible = "mediatek,mt6873-pwrap", .data = &pwrap_mt6873 }, > + { .compatible = "mediatek,mt7622-pwrap", .data = &pwrap_mt7622 }, > + { .compatible = "mediatek,mt8135-pwrap", .data = &pwrap_mt8135 }, > + { .compatible = "mediatek,mt8173-pwrap", .data = &pwrap_mt8173 }, > + { .compatible = "mediatek,mt8183-pwrap", .data = &pwrap_mt8183 }, > + { .compatible = "mediatek,mt8186-pwrap", .data = &pwrap_mt8186 }, > + { .compatible = "mediatek,mt8195-pwrap", .data = &pwrap_mt8195 }, > + { .compatible = "mediatek,mt8516-pwrap", .data = &pwrap_mt8516 }, > + { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl); >
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c index 7d02e1d4faf4..c018092e6cbe 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -1960,33 +1960,17 @@ static const struct pwrap_slv_type pmic_mt6397 = { }; static const struct of_device_id of_slave_match_tbl[] = { - { - .compatible = "mediatek,mt6323", - .data = &pmic_mt6323, - }, { - .compatible = "mediatek,mt6351", - .data = &pmic_mt6351, - }, { - .compatible = "mediatek,mt6357", - .data = &pmic_mt6357, - }, { - .compatible = "mediatek,mt6358", - .data = &pmic_mt6358, - }, { - .compatible = "mediatek,mt6359", - .data = &pmic_mt6359, - }, { - /* The MT6380 PMIC only implements a regulator, so we bind it - * directly instead of using a MFD. - */ - .compatible = "mediatek,mt6380-regulator", - .data = &pmic_mt6380, - }, { - .compatible = "mediatek,mt6397", - .data = &pmic_mt6397, - }, { - /* sentinel */ - } + { .compatible = "mediatek,mt6323", .data = &pmic_mt6323 }, + { .compatible = "mediatek,mt6351", .data = &pmic_mt6351 }, + { .compatible = "mediatek,mt6357", .data = &pmic_mt6357 }, + { .compatible = "mediatek,mt6358", .data = &pmic_mt6358 }, + { .compatible = "mediatek,mt6359", .data = &pmic_mt6359 }, + /* The MT6380 PMIC only implements a regulator, so we bind it + * directly instead of using a MFD. + */ + { .compatible = "mediatek,mt6380-regulator", .data = &pmic_mt6380 }, + { .compatible = "mediatek,mt6397", .data = &pmic_mt6397 }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_slave_match_tbl); @@ -2145,45 +2129,19 @@ static struct pmic_wrapper_type pwrap_mt8186 = { }; static const struct of_device_id of_pwrap_match_tbl[] = { - { - .compatible = "mediatek,mt2701-pwrap", - .data = &pwrap_mt2701, - }, { - .compatible = "mediatek,mt6765-pwrap", - .data = &pwrap_mt6765, - }, { - .compatible = "mediatek,mt6779-pwrap", - .data = &pwrap_mt6779, - }, { - .compatible = "mediatek,mt6797-pwrap", - .data = &pwrap_mt6797, - }, { - .compatible = "mediatek,mt6873-pwrap", - .data = &pwrap_mt6873, - }, { - .compatible = "mediatek,mt7622-pwrap", - .data = &pwrap_mt7622, - }, { - .compatible = "mediatek,mt8135-pwrap", - .data = &pwrap_mt8135, - }, { - .compatible = "mediatek,mt8173-pwrap", - .data = &pwrap_mt8173, - }, { - .compatible = "mediatek,mt8183-pwrap", - .data = &pwrap_mt8183, - }, { - .compatible = "mediatek,mt8186-pwrap", - .data = &pwrap_mt8186, - }, { - .compatible = "mediatek,mt8195-pwrap", - .data = &pwrap_mt8195, - }, { - .compatible = "mediatek,mt8516-pwrap", - .data = &pwrap_mt8516, - }, { - /* sentinel */ - } + { .compatible = "mediatek,mt2701-pwrap", .data = &pwrap_mt2701 }, + { .compatible = "mediatek,mt6765-pwrap", .data = &pwrap_mt6765 }, + { .compatible = "mediatek,mt6779-pwrap", .data = &pwrap_mt6779 }, + { .compatible = "mediatek,mt6797-pwrap", .data = &pwrap_mt6797 }, + { .compatible = "mediatek,mt6873-pwrap", .data = &pwrap_mt6873 }, + { .compatible = "mediatek,mt7622-pwrap", .data = &pwrap_mt7622 }, + { .compatible = "mediatek,mt8135-pwrap", .data = &pwrap_mt8135 }, + { .compatible = "mediatek,mt8173-pwrap", .data = &pwrap_mt8173 }, + { .compatible = "mediatek,mt8183-pwrap", .data = &pwrap_mt8183 }, + { .compatible = "mediatek,mt8186-pwrap", .data = &pwrap_mt8186 }, + { .compatible = "mediatek,mt8195-pwrap", .data = &pwrap_mt8195 }, + { .compatible = "mediatek,mt8516-pwrap", .data = &pwrap_mt8516 }, + { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl);
Compress each entry of the of_device_id tables in this driver to one line instead of three, as they fit just fine in a single line. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/soc/mediatek/mtk-pmic-wrap.c | 90 ++++++++-------------------- 1 file changed, 24 insertions(+), 66 deletions(-)