Skip to content

Commit 6579a03

Browse files
Damon Dinglumag
authored andcommitted
drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing
With the commit f379523 ("drm/bridge: analogix_dp: handle clock via runtime PM"), the PM operations can help enable/disable the clock. The err_disable_clk label and clk_disable_unprepare() operations are no longer necessary because the analogix_dp_resume() will not be called during probing. Fixes: f379523 ("drm/bridge: analogix_dp: handle clock via runtime PM") Suggested-by: Douglas Anderson <[email protected]> Reviewed-by: Douglas Anderson <[email protected]> Signed-off-by: Damon Ding <[email protected]> Reviewed-by: Heiko Stuebner <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent be9b3f9 commit 6579a03

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,10 +1531,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
15311531
}
15321532

15331533
dp->reg_base = devm_platform_ioremap_resource(pdev, 0);
1534-
if (IS_ERR(dp->reg_base)) {
1535-
ret = PTR_ERR(dp->reg_base);
1536-
goto err_disable_clk;
1537-
}
1534+
if (IS_ERR(dp->reg_base))
1535+
return ERR_CAST(dp->reg_base);
15381536

15391537
dp->force_hpd = of_property_read_bool(dev->of_node, "force-hpd");
15401538

@@ -1546,8 +1544,7 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
15461544
if (IS_ERR(dp->hpd_gpiod)) {
15471545
dev_err(dev, "error getting HDP GPIO: %ld\n",
15481546
PTR_ERR(dp->hpd_gpiod));
1549-
ret = PTR_ERR(dp->hpd_gpiod);
1550-
goto err_disable_clk;
1547+
return ERR_CAST(dp->hpd_gpiod);
15511548
}
15521549

15531550
if (dp->hpd_gpiod) {
@@ -1567,8 +1564,7 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
15671564

15681565
if (dp->irq == -ENXIO) {
15691566
dev_err(&pdev->dev, "failed to get irq\n");
1570-
ret = -ENODEV;
1571-
goto err_disable_clk;
1567+
return ERR_PTR(-ENODEV);
15721568
}
15731569

15741570
ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
@@ -1577,7 +1573,7 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
15771573
irq_flags, "analogix-dp", dp);
15781574
if (ret) {
15791575
dev_err(&pdev->dev, "failed to request irq\n");
1580-
goto err_disable_clk;
1576+
return ERR_PTR(ret);
15811577
}
15821578

15831579
dp->aux.name = "DP-AUX";
@@ -1593,10 +1589,6 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)
15931589
goto err_disable_clk;
15941590

15951591
return dp;
1596-
1597-
err_disable_clk:
1598-
clk_disable_unprepare(dp->clock);
1599-
return ERR_PTR(ret);
16001592
}
16011593
EXPORT_SYMBOL_GPL(analogix_dp_probe);
16021594

0 commit comments

Comments
 (0)