[PATCH -next] omapfb: connector-analog-tv: simplify the return expression of tvc_connect()

Subsystems: framebuffer layer, omap display subsystem and framebuffer support (dss2), the rest

STALE2114d

2 messages, 2 authors, 2020-10-16 · open the first message on its own page

[PATCH -next] omapfb: connector-analog-tv: simplify the return expression of tvc_connect()

From: Qinglang Miao <hidden>
Date: 2020-09-21 13:10:44

Simplify the return expression.

Signed-off-by: Qinglang Miao <redacted>
---
 .../fbdev/omap2/omapfb/displays/connector-analog-tv.c      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
index 63bd13ba4..a9fd732f8 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
@@ -47,18 +47,13 @@ static int tvc_connect(struct omap_dss_device *dssdev)
 {
 	struct panel_drv_data *ddata = to_panel_data(dssdev);
 	struct omap_dss_device *in = ddata->in;
-	int r;
 
 	dev_dbg(ddata->dev, "connect\n");
 
 	if (omapdss_device_is_connected(dssdev))
 		return 0;
 
-	r = in->ops.atv->connect(in, dssdev);
-	if (r)
-		return r;
-
-	return 0;
+	return in->ops.atv->connect(in, dssdev);
 }
 
 static void tvc_disconnect(struct omap_dss_device *dssdev)
-- 
2.23.0

Re: [PATCH -next] omapfb: connector-analog-tv: simplify the return expression of tvc_connect()

From: Sam Ravnborg <hidden>
Date: 2020-10-16 21:18:38

On Mon, Sep 21, 2020 at 09:10:49PM +0800, Qinglang Miao wrote:
Simplify the return expression.

Signed-off-by: Qinglang Miao <redacted>
Thanks, applied to drm-misc-next.

	Sam
quoted hunk
---
 .../fbdev/omap2/omapfb/displays/connector-analog-tv.c      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
index 63bd13ba4..a9fd732f8 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c
@@ -47,18 +47,13 @@ static int tvc_connect(struct omap_dss_device *dssdev)
 {
 	struct panel_drv_data *ddata = to_panel_data(dssdev);
 	struct omap_dss_device *in = ddata->in;
-	int r;
 
 	dev_dbg(ddata->dev, "connect\n");
 
 	if (omapdss_device_is_connected(dssdev))
 		return 0;
 
-	r = in->ops.atv->connect(in, dssdev);
-	if (r)
-		return r;
-
-	return 0;
+	return in->ops.atv->connect(in, dssdev);
 }
 
 static void tvc_disconnect(struct omap_dss_device *dssdev)
-- 
2.23.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help