pinctrl: mediatek: common-v1: Use common probe function

Most of the mediatek pinctrl drivers are calling mtk_pctrl_init() and
passing only a pointer to struct mtk_pinctrl_devdata, as the regmap
handle it passed from device-tree, with the exception of mt6397.

For all of the drivers that don't require passing a struct regmap
pointer from a parent device, simplify the probe mechanism by assigning
the required structure as match data and use mtk_pctrl_common_probe()
as their probe function.

While at it, also collapse the of_device_id entries to a single line,
as they all fit in max 83 columns, which is acceptable.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220222111144.20796-4-angelogioacchino.delregno@collabora.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt2701.c b/drivers/pinctrl/mediatek/pinctrl-mt2701.c
index 37228dd..2f88212 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt2701.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt2701.c
@@ -534,20 +534,15 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = {
        },
 };
 
-static int mt2701_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_pctrl_init(pdev, &mt2701_pinctrl_data, NULL);
-}
-
 static const struct of_device_id mt2701_pctrl_match[] = {
-       { .compatible = "mediatek,mt2701-pinctrl", },
-       { .compatible = "mediatek,mt7623-pinctrl", },
+       { .compatible = "mediatek,mt2701-pinctrl", .data = &mt2701_pinctrl_data },
+       { .compatible = "mediatek,mt7623-pinctrl", .data = &mt2701_pinctrl_data },
        {}
 };
 MODULE_DEVICE_TABLE(of, mt2701_pctrl_match);
 
 static struct platform_driver mtk_pinctrl_driver = {
-       .probe = mt2701_pinctrl_probe,
+       .probe = mtk_pctrl_common_probe,
        .driver = {
                .name = "mediatek-mt2701-pinctrl",
                .of_match_table = mt2701_pctrl_match,

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt2712.c b/drivers/pinctrl/mediatek/pinctrl-mt2712.c
index ba35fc6..03aa144 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt2712.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt2712.c
@@ -587,21 +587,14 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = {
        },
 };
 
-static int mt2712_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_pctrl_init(pdev, &mt2712_pinctrl_data, NULL);
-}
-
 static const struct of_device_id mt2712_pctrl_match[] = {
-       {
-               .compatible = "mediatek,mt2712-pinctrl",
-       },
+       { .compatible = "mediatek,mt2712-pinctrl", .data = &mt2712_pinctrl_data },
        { }
 };
 MODULE_DEVICE_TABLE(of, mt2712_pctrl_match);
 
 static struct platform_driver mtk_pinctrl_driver = {
-       .probe = mt2712_pinctrl_probe,
+       .probe = mtk_pctrl_common_probe,
        .driver = {
                .name = "mediatek-mt2712-pinctrl",
                .of_match_table = mt2712_pctrl_match,

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8127.c b/drivers/pinctrl/mediatek/pinctrl-mt8127.c
index eaf5c76..76cb525 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8127.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8127.c
@@ -303,18 +303,13 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = {
        },
 };
 
-static int mt8127_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_pctrl_init(pdev, &mt8127_pinctrl_data, NULL);
-}
-
 static const struct of_device_id mt8127_pctrl_match[] = {
-       { .compatible = "mediatek,mt8127-pinctrl", },
+       { .compatible = "mediatek,mt8127-pinctrl", .data = &mt8127_pinctrl_data },
        { }
 };
 
 static struct platform_driver mtk_pinctrl_driver = {
-       .probe = mt8127_pinctrl_probe,
+       .probe = mtk_pctrl_common_probe,
        .driver = {
                .name = "mediatek-mt8127-pinctrl",
                .of_match_table = mt8127_pctrl_match,

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8135.c b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
index b8f4080..4c20b79 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8135.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
@@ -316,20 +316,13 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
        },
 };
 
-static int mt8135_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_pctrl_init(pdev, &mt8135_pinctrl_data, NULL);
-}
-
 static const struct of_device_id mt8135_pctrl_match[] = {
-       {
-               .compatible = "mediatek,mt8135-pinctrl",
-       },
+       { .compatible = "mediatek,mt8135-pinctrl", .data = &mt8135_pinctrl_data },
        { }
 };
 
 static struct platform_driver mtk_pinctrl_driver = {
-       .probe = mt8135_pinctrl_probe,
+       .probe = mtk_pctrl_common_probe,
        .driver = {
                .name = "mediatek-mt8135-pinctrl",
                .of_match_table = mt8135_pctrl_match,

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8167.c b/drivers/pinctrl/mediatek/pinctrl-mt8167.c
index ba12ef7..08aabf4 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8167.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8167.c
@@ -335,22 +335,15 @@ static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = {
        },
 };
 
-static int mt8167_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_pctrl_init(pdev, &mt8167_pinctrl_data, NULL);
-}
-
 static const struct of_device_id mt8167_pctrl_match[] = {
-       {
-               .compatible = "mediatek,mt8167-pinctrl",
-       },
+       { .compatible = "mediatek,mt8167-pinctrl", .data = &mt8167_pinctrl_data },
        {}
 };
 
 MODULE_DEVICE_TABLE(of, mt8167_pctrl_match);
 
 static struct platform_driver mtk_pinctrl_driver = {
-       .probe = mt8167_pinctrl_probe,
+       .probe = mtk_pctrl_common_probe,
        .driver = {
                .name = "mediatek-mt8167-pinctrl",
                .of_match_table = mt8167_pctrl_match,

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8365.c b/drivers/pinctrl/mediatek/pinctrl-mt8365.c
index 79b1fee..6863a81 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8365.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8365.c
@@ -469,20 +469,13 @@ static const struct mtk_pinctrl_devdata mt8365_pinctrl_data = {
        },
 };
 
-static int mtk_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_pctrl_init(pdev, &mt8365_pinctrl_data, NULL);
-}
-
 static const struct of_device_id mt8365_pctrl_match[] = {
-       {
-               .compatible = "mediatek,mt8365-pinctrl",
-       },
+       { .compatible = "mediatek,mt8365-pinctrl", .data = &mt8365_pinctrl_data },
        {}
 };
 
 static struct platform_driver mtk_pinctrl_driver = {
-       .probe = mtk_pinctrl_probe,
+       .probe = mtk_pctrl_common_probe,
        .driver = {
                .name = "mediatek-mt8365-pinctrl",
                .of_match_table = mt8365_pctrl_match,

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
index 219fb4b..99c1a04 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8516.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
@@ -335,22 +335,15 @@ static const struct mtk_pinctrl_devdata mt8516_pinctrl_data = {
        },
 };
 
-static int mt8516_pinctrl_probe(struct platform_device *pdev)
-{
-       return mtk_pctrl_init(pdev, &mt8516_pinctrl_data, NULL);
-}
-
 static const struct of_device_id mt8516_pctrl_match[] = {
-       {
-               .compatible = "mediatek,mt8516-pinctrl",
-       },
+       { .compatible = "mediatek,mt8516-pinctrl", .data = &mt8516_pinctrl_data },
        {}
 };
 
 MODULE_DEVICE_TABLE(of, mt8516_pctrl_match);
 
 static struct platform_driver mtk_pinctrl_driver = {
-       .probe = mt8516_pinctrl_probe,
+       .probe = mtk_pctrl_common_probe,
        .driver = {
                .name = "mediatek-mt8516-pinctrl",
                .of_match_table = mt8516_pctrl_match,