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

Commit 0df8ad71 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: remove enum omap_dss_overlay_managers 



We have two almost the same enums: omap_channel and
omap_dss_overlay_managers. omap_channel is used almost everywhere, and
omap_channel assigns explicit values to the enum values which are needed
for proper operation.

omap_dss_overlay_managers is only used in one place, so it's easy to
remove it, which is what this patch does.

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

drivers/video/omap2/dss/overlay.c

+3 −3
Original line number Diff line number Diff line
@@ -530,10 +530,10 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force) 
	struct omap_overlay_manager *lcd2_mgr = NULL;

	struct omap_overlay_manager *mgr = NULL;



	lcd_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_LCD);

	tv_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_TV);

	lcd_mgr = omap_dss_get_overlay_manager(OMAP_DSS_CHANNEL_LCD);

	tv_mgr = omap_dss_get_overlay_manager(OMAP_DSS_CHANNEL_DIGIT);

	if (dss_has_feature(FEAT_MGR_LCD2))

		lcd2_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_LCD2);

		lcd2_mgr = omap_dss_get_overlay_manager(OMAP_DSS_CHANNEL_LCD2);



	if (dssdev->channel == OMAP_DSS_CHANNEL_LCD2) {

		if (!lcd2_mgr->device || force) {

include/video/omapdss.h

+0 −7
Original line number Diff line number Diff line
@@ -167,13 +167,6 @@ enum omap_dss_audio_state { 
	OMAP_DSS_AUDIO_PLAYING,

};



/* XXX perhaps this should be removed */

enum omap_dss_overlay_managers {

	OMAP_DSS_OVL_MGR_LCD,

	OMAP_DSS_OVL_MGR_TV,

	OMAP_DSS_OVL_MGR_LCD2,

};



enum omap_dss_rotation_type {

	OMAP_DSS_ROT_DMA	= 1 << 0,

	OMAP_DSS_ROT_VRFB	= 1 << 1,