Hi Liu. On Tue, Sep 15, 2020 at 11:26:27AM +0800, Liu Shixin wrote: > Simplify the return expression. > > Signed-off-by: Liu Shixin <liushixin2@xxxxxxxxxx> Thanks, also applied. If you have other drm/fbdev patches pending then I have missed them. So please resend if this is the case. Sam > --- > drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c > index b4a1aefff766..2fa436475b40 100644 > --- a/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c > +++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c > @@ -51,16 +51,11 @@ static int dvic_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.dvi->connect(in, dssdev); > - if (r) > - return r; > - > - return 0; > + return in->ops.dvi->connect(in, dssdev); > } > > static void dvic_disconnect(struct omap_dss_device *dssdev) > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel