@@ -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);
}
/* -----------------------------------------------------------------------------
Simplify the return expression. Signed-off-by: Liu Shixin <liushixin2@huawei.com> --- drivers/gpu/drm/omapdrm/dss/dsi.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)