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

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

OMAPDSS: APPLY: simplify dss_mgr_enable 



dss_mgr_enable() has some extra assigns to mp->enabled, which can be
removed.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 82153eda

drivers/video/omap2/dss/apply.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1025,16 +1025,14 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr) 
	spin_lock_irqsave(&data_lock, flags);

	spin_lock_irqsave(&data_lock, flags);





	mp->enabled = true;

	mp->enabled = true;



	r = dss_check_settings(mgr, mgr->device);

	r = dss_check_settings(mgr, mgr->device);

	mp->enabled = false;

	if (r) {

	if (r) {

		DSSERR("failed to enable manager %d: check_settings failed\n",

		DSSERR("failed to enable manager %d: check_settings failed\n",

				mgr->id);

				mgr->id);

		goto err;

		goto err;

	}

	}





	mp->enabled = true;



	dss_mgr_setup_fifos(mgr);

	dss_mgr_setup_fifos(mgr);





	dss_write_regs();

	dss_write_regs();
@@ -1054,6 +1052,7 @@ int dss_mgr_enable(struct omap_overlay_manager *mgr) 
	return 0;

	return 0;





err:

err:

	mp->enabled = false;

	spin_unlock_irqrestore(&data_lock, flags);

	spin_unlock_irqrestore(&data_lock, flags);

	mutex_unlock(&apply_lock);

	mutex_unlock(&apply_lock);

	return r;

	return r;