Skip to content

Commit be47140

Browse files
AngeloGioacchino Del RegnoChun-Kuang Hu
authored andcommitted
drm/mediatek: mtk_dpi: Simplify with dev_err_probe()
Use dev_err_probe() across the entire probe function of this driver to shrink the size. Signed-off-by: AngeloGioacchino Del Regno <[email protected]> Reviewed-by: Fei Shao <[email protected]> Reviewed-by: CK Hu <[email protected]> Link: https://patchwork.kernel.org/project/dri-devel/patch/[email protected]/ Signed-off-by: Chun-Kuang Hu <[email protected]>
1 parent 47d4bb6 commit be47140

File tree

1 file changed

+14
-30
lines changed

1 file changed

+14
-30
lines changed

drivers/gpu/drm/mediatek/mtk_dpi.c

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,38 +1040,24 @@ static int mtk_dpi_probe(struct platform_device *pdev)
10401040
}
10411041
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
10421042
dpi->regs = devm_ioremap_resource(dev, mem);
1043-
if (IS_ERR(dpi->regs)) {
1044-
ret = PTR_ERR(dpi->regs);
1045-
dev_err(dev, "Failed to ioremap mem resource: %d\n", ret);
1046-
return ret;
1047-
}
1043+
if (IS_ERR(dpi->regs))
1044+
return dev_err_probe(dev, PTR_ERR(dpi->regs),
1045+
"Failed to ioremap mem resource\n");
10481046

10491047
dpi->engine_clk = devm_clk_get(dev, "engine");
1050-
if (IS_ERR(dpi->engine_clk)) {
1051-
ret = PTR_ERR(dpi->engine_clk);
1052-
if (ret != -EPROBE_DEFER)
1053-
dev_err(dev, "Failed to get engine clock: %d\n", ret);
1054-
1055-
return ret;
1056-
}
1048+
if (IS_ERR(dpi->engine_clk))
1049+
return dev_err_probe(dev, PTR_ERR(dpi->engine_clk),
1050+
"Failed to get engine clock\n");
10571051

10581052
dpi->pixel_clk = devm_clk_get(dev, "pixel");
1059-
if (IS_ERR(dpi->pixel_clk)) {
1060-
ret = PTR_ERR(dpi->pixel_clk);
1061-
if (ret != -EPROBE_DEFER)
1062-
dev_err(dev, "Failed to get pixel clock: %d\n", ret);
1063-
1064-
return ret;
1065-
}
1053+
if (IS_ERR(dpi->pixel_clk))
1054+
return dev_err_probe(dev, PTR_ERR(dpi->pixel_clk),
1055+
"Failed to get pixel clock\n");
10661056

10671057
dpi->tvd_clk = devm_clk_get(dev, "pll");
1068-
if (IS_ERR(dpi->tvd_clk)) {
1069-
ret = PTR_ERR(dpi->tvd_clk);
1070-
if (ret != -EPROBE_DEFER)
1071-
dev_err(dev, "Failed to get tvdpll clock: %d\n", ret);
1072-
1073-
return ret;
1074-
}
1058+
if (IS_ERR(dpi->tvd_clk))
1059+
return dev_err_probe(dev, PTR_ERR(dpi->tvd_clk),
1060+
"Failed to get tvdpll clock\n");
10751061

10761062
dpi->irq = platform_get_irq(pdev, 0);
10771063
if (dpi->irq <= 0)
@@ -1095,10 +1081,8 @@ static int mtk_dpi_probe(struct platform_device *pdev)
10951081
return ret;
10961082

10971083
ret = component_add(dev, &mtk_dpi_component_ops);
1098-
if (ret) {
1099-
dev_err(dev, "Failed to add component: %d\n", ret);
1100-
return ret;
1101-
}
1084+
if (ret)
1085+
return dev_err_probe(dev, ret, "Failed to add component.\n");
11021086

11031087
return 0;
11041088
}

0 commit comments

Comments
 (0)