Skip to content

Commit 5c98568

Browse files
AngeloGioacchino Del RegnoChun-Kuang Hu
authored andcommitted
drm/mediatek: dsi: Simplify with dev_err_probe and remove gotos
Most of the functions that are called in the probe callback are devm managed, or all but mipi_dsi_host_register(): simplify the probe function's error paths with dev_err_probe() and remove the lonely instance of `goto err_unregister_host` by just directly calling the mipi_dsi_host_unregister() function in the devm_request_irq() error path, allowing to also remove the same label. Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: CK Hu <ck.hu@mediatek.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20240215085316.56835-8-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent e4732b5 commit 5c98568

File tree

1 file changed

+18
-42
lines changed

1 file changed

+18
-42
lines changed

drivers/gpu/drm/mediatek/mtk_dsi.c

Lines changed: 18 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,64 +1117,44 @@ static int mtk_dsi_probe(struct platform_device *pdev)
11171117
dsi->driver_data = of_device_get_match_data(dev);
11181118

11191119
dsi->engine_clk = devm_clk_get(dev, "engine");
1120-
if (IS_ERR(dsi->engine_clk)) {
1121-
ret = PTR_ERR(dsi->engine_clk);
1120+
if (IS_ERR(dsi->engine_clk))
1121+
return dev_err_probe(dev, PTR_ERR(dsi->engine_clk),
1122+
"Failed to get engine clock\n");
11221123

1123-
if (ret != -EPROBE_DEFER)
1124-
dev_err(dev, "Failed to get engine clock: %d\n", ret);
1125-
return ret;
1126-
}
11271124

11281125
dsi->digital_clk = devm_clk_get(dev, "digital");
1129-
if (IS_ERR(dsi->digital_clk)) {
1130-
ret = PTR_ERR(dsi->digital_clk);
1131-
1132-
if (ret != -EPROBE_DEFER)
1133-
dev_err(dev, "Failed to get digital clock: %d\n", ret);
1134-
return ret;
1135-
}
1126+
if (IS_ERR(dsi->digital_clk))
1127+
return dev_err_probe(dev, PTR_ERR(dsi->digital_clk),
1128+
"Failed to get digital clock\n");
11361129

11371130
dsi->hs_clk = devm_clk_get(dev, "hs");
1138-
if (IS_ERR(dsi->hs_clk)) {
1139-
ret = PTR_ERR(dsi->hs_clk);
1140-
dev_err(dev, "Failed to get hs clock: %d\n", ret);
1141-
return ret;
1142-
}
1131+
if (IS_ERR(dsi->hs_clk))
1132+
return dev_err_probe(dev, PTR_ERR(dsi->hs_clk), "Failed to get hs clock\n");
11431133

11441134
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
11451135
dsi->regs = devm_ioremap_resource(dev, regs);
1146-
if (IS_ERR(dsi->regs)) {
1147-
ret = PTR_ERR(dsi->regs);
1148-
dev_err(dev, "Failed to ioremap memory: %d\n", ret);
1149-
return ret;
1150-
}
1136+
if (IS_ERR(dsi->regs))
1137+
return dev_err_probe(dev, PTR_ERR(dsi->regs), "Failed to ioremap memory\n");
11511138

11521139
dsi->phy = devm_phy_get(dev, "dphy");
1153-
if (IS_ERR(dsi->phy)) {
1154-
ret = PTR_ERR(dsi->phy);
1155-
dev_err(dev, "Failed to get MIPI-DPHY: %d\n", ret);
1156-
return ret;
1157-
}
1140+
if (IS_ERR(dsi->phy))
1141+
return dev_err_probe(dev, PTR_ERR(dsi->phy), "Failed to get MIPI-DPHY\n");
11581142

11591143
irq_num = platform_get_irq(pdev, 0);
1160-
if (irq_num < 0) {
1161-
ret = irq_num;
1162-
return ret;
1163-
}
1144+
if (irq_num < 0)
1145+
return irq_num;
11641146

11651147
dsi->host.ops = &mtk_dsi_ops;
11661148
dsi->host.dev = dev;
11671149
ret = mipi_dsi_host_register(&dsi->host);
1168-
if (ret < 0) {
1169-
dev_err(dev, "failed to register DSI host: %d\n", ret);
1170-
return ret;
1171-
}
1150+
if (ret < 0)
1151+
return dev_err_probe(dev, ret, "Failed to register DSI host\n");
11721152

11731153
ret = devm_request_irq(&pdev->dev, irq_num, mtk_dsi_irq,
11741154
IRQF_TRIGGER_NONE, dev_name(&pdev->dev), dsi);
11751155
if (ret) {
1176-
dev_err(&pdev->dev, "failed to request mediatek dsi irq\n");
1177-
goto err_unregister_host;
1156+
mipi_dsi_host_unregister(&dsi->host);
1157+
return dev_err_probe(&pdev->dev, ret, "Failed to request DSI irq\n");
11781158
}
11791159

11801160
init_waitqueue_head(&dsi->irq_wait_queue);
@@ -1186,10 +1166,6 @@ static int mtk_dsi_probe(struct platform_device *pdev)
11861166
dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
11871167

11881168
return 0;
1189-
1190-
err_unregister_host:
1191-
mipi_dsi_host_unregister(&dsi->host);
1192-
return ret;
11931169
}
11941170

11951171
static void mtk_dsi_remove(struct platform_device *pdev)

0 commit comments

Comments
 (0)