OSDN Git Service

drm/mediatek: mtk_dpi: Simplify with devm_drm_bridge_add()
authorAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Wed, 26 Jul 2023 08:22:40 +0000 (10:22 +0200)
committerChun-Kuang Hu <chunkuang.hu@kernel.org>
Wed, 9 Aug 2023 22:54:43 +0000 (22:54 +0000)
Change drm_bridge_add() to its devm variant to slightly simplify the
probe function.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Fei Shao <fshao@chromium.org>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20230726082245.550929-2-angelogioacchino.delregno@collabora.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
drivers/gpu/drm/mediatek/mtk_dpi.c

index 948a53f..376006e 100644 (file)
@@ -1090,11 +1090,12 @@ static int mtk_dpi_probe(struct platform_device *pdev)
        dpi->bridge.of_node = dev->of_node;
        dpi->bridge.type = DRM_MODE_CONNECTOR_DPI;
 
-       drm_bridge_add(&dpi->bridge);
+       ret = devm_drm_bridge_add(dev, &dpi->bridge);
+       if (ret)
+               return ret;
 
        ret = component_add(dev, &mtk_dpi_component_ops);
        if (ret) {
-               drm_bridge_remove(&dpi->bridge);
                dev_err(dev, "Failed to add component: %d\n", ret);
                return ret;
        }
@@ -1104,10 +1105,7 @@ static int mtk_dpi_probe(struct platform_device *pdev)
 
 static int mtk_dpi_remove(struct platform_device *pdev)
 {
-       struct mtk_dpi *dpi = platform_get_drvdata(pdev);
-
        component_del(&pdev->dev, &mtk_dpi_component_ops);
-       drm_bridge_remove(&dpi->bridge);
 
        return 0;
 }