| Message ID | 20230719075056.72178-2-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/mediatek: Small mtk-dpi cleanups | expand |
On Wed, Jul 19, 2023 at 3:51 PM AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> wrote: > > 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>
Hi, Angelo: On Wed, 2023-07-19 at 09:50 +0200, AngeloGioacchino Del Regno wrote: > Change drm_bridge_add() to its devm variant to slightly simplify the > probe function. Reviewed-by: CK Hu <ck.hu@mediatek.com> > > Signed-off-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > --- > drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c > b/drivers/gpu/drm/mediatek/mtk_dpi.c > index 948a53f1f4b3..74068aa70e0c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -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; > } > @@ -1107,7 +1108,6 @@ 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; > }
Hi, Angelo: On Wed, 2023-07-26 at 13:21 +0800, CK Hu wrote: > Hi, Angelo: > > On Wed, 2023-07-19 at 09:50 +0200, AngeloGioacchino Del Regno wrote: > > Change drm_bridge_add() to its devm variant to slightly simplify > > the > > probe function. > > Reviewed-by: CK Hu <ck.hu@mediatek.com> > > > > > Signed-off-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > --- > > drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c > > b/drivers/gpu/drm/mediatek/mtk_dpi.c > > index 948a53f1f4b3..74068aa70e0c 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > > @@ -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; > > } > > @@ -1107,7 +1108,6 @@ static int mtk_dpi_remove(struct > > platform_device *pdev) > > struct mtk_dpi *dpi = platform_get_drvdata(pdev); Remove this also. So drop my Reviewed-by tag. Regards, CK > > > > component_del(&pdev->dev, &mtk_dpi_component_ops); > > - drm_bridge_remove(&dpi->bridge); > > > > return 0; > > }
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 948a53f1f4b3..74068aa70e0c 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -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; } @@ -1107,7 +1108,6 @@ 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; }
Change drm_bridge_add() to its devm variant to slightly simplify the probe function. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)