2020-09-21 08:05:28

by Liu Shixin

Subject: [PATCH -next] omapfb: simplify the return expression of panel_dpi_connect

Simplify the return expression.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
index 37c9f5bfaefe..ff3d1e8e1e7b 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
@@ -37,16 +37,11 @@ static int panel_dpi_connect(struct omap_dss_device *dssdev)
{
struct panel_drv_data *ddata = to_panel_data(dssdev);
struct omap_dss_device *in = ddata->in;
- int r;

if (omapdss_device_is_connected(dssdev))
return 0;

- r = in->ops.dpi->connect(in, dssdev);
- if (r)
- return r;
-
- return 0;
+ return in->ops.dpi->connect(in, dssdev);
}

static void panel_dpi_disconnect(struct omap_dss_device *dssdev)
--
2.25.1

2020-10-16 22:33:15

by Sam Ravnborg

Subject: Re: [PATCH -next] omapfb: simplify the return expression of panel_dpi_connect

Hi Liu Shixin

On Mon, Sep 21, 2020 at 04:24:43PM +0800, Liu Shixin wrote:
> Simplify the return expression.
>
> Signed-off-by: Liu Shixin <[email protected]>

Thanks.
Applied this and the following two patches to drm-misc-next.
They will appear in -next in a few weeks.

Sam

> ---
> drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
> index 37c9f5bfaefe..ff3d1e8e1e7b 100644
> --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
> +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c
> @@ -37,16 +37,11 @@ static int panel_dpi_connect(struct omap_dss_device *dssdev)
> {
> struct panel_drv_data *ddata = to_panel_data(dssdev);
> struct omap_dss_device *in = ddata->in;
> - int r;
>
> if (omapdss_device_is_connected(dssdev))
> return 0;
>
> - r = in->ops.dpi->connect(in, dssdev);
> - if (r)
> - return r;
> -
> - return 0;
> + return in->ops.dpi->connect(in, dssdev);
> }
>
> static void panel_dpi_disconnect(struct omap_dss_device *dssdev)
> --
> 2.25.1
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel