Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b742648c authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: remove extra out == NULL checks 



All the output drivers check for 'out' being NULL, but it can never be
NULL. Remove the check.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 65904155

drivers/video/fbdev/omap2/dss/dpi.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev) 
		goto err_no_reg;

	}



	if (out == NULL || out->manager == NULL) {

	if (out->manager == NULL) {

		DSSERR("failed to enable display: no output/manager\n");

		r = -ENODEV;

		goto err_no_out_mgr;

drivers/video/fbdev/omap2/dss/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3833,7 +3833,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) 
	u16 word_count;

	int r;



	if (out == NULL || out->manager == NULL) {

	if (out->manager == NULL) {

		DSSERR("failed to enable display: no output/manager\n");

		return -ENODEV;

	}

drivers/video/fbdev/omap2/dss/hdmi4.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) 


	mutex_lock(&hdmi.lock);



	if (out == NULL || out->manager == NULL) {

	if (out->manager == NULL) {

		DSSERR("failed to enable display: no output/manager\n");

		r = -ENODEV;

		goto err0;

drivers/video/fbdev/omap2/dss/hdmi5.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) 


	mutex_lock(&hdmi.lock);



	if (out == NULL || out->manager == NULL) {

	if (out->manager == NULL) {

		DSSERR("failed to enable display: no output/manager\n");

		r = -ENODEV;

		goto err0;

drivers/video/fbdev/omap2/dss/rfbi.c

+1 −1
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ static int rfbi_display_enable(struct omap_dss_device *dssdev) 
	struct omap_dss_device *out = &rfbi.output;

	int r;



	if (out == NULL || out->manager == NULL) {

	if (out->manager == NULL) {

		DSSERR("failed to enable display: no output/manager\n");

		return -ENODEV;

	}