drm/mediatek: dp: Move PHY registration to new function

In preparation for adding support for eDP, move the PHY registration
code to a new mtk_dp_register_phy() function for better readability.

This commit brings no functional changes.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20230725073234.55892-9-angelogioacchino.delregno@collabora.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
index c1d1a88..1b4219e 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dp.c
+++ b/drivers/gpu/drm/mediatek/mtk_dp.c
@@ -2478,6 +2478,29 @@ static int mtk_dp_register_audio_driver(struct device *dev)
        return PTR_ERR_OR_ZERO(mtk_dp->audio_pdev);
 }
 
+static int mtk_dp_register_phy(struct mtk_dp *mtk_dp)
+{
+       struct device *dev = mtk_dp->dev;
+
+       mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek-dp-phy",
+                                                       PLATFORM_DEVID_AUTO,
+                                                       &mtk_dp->regs,
+                                                       sizeof(struct regmap *));
+       if (IS_ERR(mtk_dp->phy_dev))
+               return dev_err_probe(dev, PTR_ERR(mtk_dp->phy_dev),
+                                    "Failed to create device mediatek-dp-phy\n");
+
+       mtk_dp_get_calibration_data(mtk_dp);
+
+       mtk_dp->phy = devm_phy_get(&mtk_dp->phy_dev->dev, "dp");
+       if (IS_ERR(mtk_dp->phy)) {
+               platform_device_unregister(mtk_dp->phy_dev);
+               return dev_err_probe(dev, PTR_ERR(mtk_dp->phy), "Failed to get phy\n");
+       }
+
+       return 0;
+}
+
 static int mtk_dp_probe(struct platform_device *pdev)
 {
        struct mtk_dp *mtk_dp;
@@ -2536,23 +2559,9 @@ static int mtk_dp_probe(struct platform_device *pdev)
                }
        }
 
-       mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek-dp-phy",
-                                                       PLATFORM_DEVID_AUTO,
-                                                       &mtk_dp->regs,
-                                                       sizeof(struct regmap *));
-       if (IS_ERR(mtk_dp->phy_dev))
-               return dev_err_probe(dev, PTR_ERR(mtk_dp->phy_dev),
-                                    "Failed to create device mediatek-dp-phy\n");
-
-       mtk_dp_get_calibration_data(mtk_dp);
-
-       mtk_dp->phy = devm_phy_get(&mtk_dp->phy_dev->dev, "dp");
-
-       if (IS_ERR(mtk_dp->phy)) {
-               platform_device_unregister(mtk_dp->phy_dev);
-               return dev_err_probe(dev, PTR_ERR(mtk_dp->phy),
-                                    "Failed to get phy\n");
-       }
+       ret = mtk_dp_register_phy(mtk_dp);
+       if (ret)
+               return ret;
 
        mtk_dp->bridge.funcs = &mtk_dp_bridge_funcs;
        mtk_dp->bridge.of_node = dev->of_node;