[PATCH -next] drm/omap: dsi: simplify the return expression of dsi_init_pll_data

Liu Shixin liushixin2 at huawei.com
Sat Sep 19 10:08:52 UTC 2020


Simplify the return expression.

Signed-off-by: Liu Shixin <liushixin2 at huawei.com>
---
 drivers/gpu/drm/omapdrm/dss/dsi.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index eeccf40bae41..cac0d1993dab 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5015,7 +5015,6 @@ static int dsi_init_pll_data(struct dss_device *dss, struct dsi_data *dsi)
 {
 	struct dss_pll *pll = &dsi->pll;
 	struct clk *clk;
-	int r;
 
 	clk = devm_clk_get(dsi->dev, "sys_clk");
 	if (IS_ERR(clk)) {
@@ -5030,11 +5029,7 @@ static int dsi_init_pll_data(struct dss_device *dss, struct dsi_data *dsi)
 	pll->hw = dsi->data->pll_hw;
 	pll->ops = &dsi_pll_ops;
 
-	r = dss_pll_register(dss, pll);
-	if (r)
-		return r;
-
-	return 0;
+	return dss_pll_register(dss, pll);
 }
 
 /* -----------------------------------------------------------------------------
-- 
2.25.1



More information about the dri-devel mailing list