2022-04-29 10:19:52

by CGEL

Subject: [PATCH] omapfb: simplify the return expression of dsi_init_pll_data()

From: Minghao Chi <[email protected]>

Simplify the return expression.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Minghao Chi <[email protected]>
---
drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
index c5f89129dcdd..531b36d2232b 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
@@ -173,7 +173,6 @@ static int dsi_init_pll_data(struct platform_device *pdev, struct hdmi_pll_data
{
struct dss_pll *pll = &hpll->pll;
struct clk *clk;
- int r;

clk = devm_clk_get(&pdev->dev, "sys_clk");
if (IS_ERR(clk)) {
@@ -203,12 +202,7 @@ static int dsi_init_pll_data(struct platform_device *pdev, struct hdmi_pll_data
}

pll->ops = &dsi_pll_ops;
-
- r = dss_pll_register(pll);
- if (r)
- return r;
-
- return 0;
+ return dss_pll_register(pll);
}

int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,
--
2.25.1

2022-05-19 09:40:06

by Helge Deller

Subject: Re: [PATCH] omapfb: simplify the return expression of dsi_init_pll_data()

On 4/29/22 07:47, [email protected] wrote:
> From: Minghao Chi <[email protected]>
>
> Simplify the return expression.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>

I've applied both of your omapfb patches to the fbdev tree.

Thanks!
Helge


> ---
> drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
> index c5f89129dcdd..531b36d2232b 100644
> --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
> +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c
> @@ -173,7 +173,6 @@ static int dsi_init_pll_data(struct platform_device *pdev, struct hdmi_pll_data
> {
> struct dss_pll *pll = &hpll->pll;
> struct clk *clk;
> - int r;
>
> clk = devm_clk_get(&pdev->dev, "sys_clk");
> if (IS_ERR(clk)) {
> @@ -203,12 +202,7 @@ static int dsi_init_pll_data(struct platform_device *pdev, struct hdmi_pll_data
> }
>
> pll->ops = &dsi_pll_ops;
> -
> - r = dss_pll_register(pll);
> - if (r)
> - return r;
> -
> - return 0;
> + return dss_pll_register(pll);
> }
>
> int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,