From d01c0bcb5a1e35485fb853e6f957b1ef4de8bc56 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 16 Nov 2011 14:54:42 +0200 Subject: [PATCH] --- yaml --- r: 284950 b: refs/heads/master c: ff4733dcf56480bebcd3801adde27213b893635d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/apply.c | 7 ------- trunk/include/video/omapdss.h | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b8b23f710a72..2447b2494724 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b53f17971700f673492e2e91b5069893e5f2d0b +refs/heads/master: ff4733dcf56480bebcd3801adde27213b893635d diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index 9916eb8e20d5..70154092d731 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -608,11 +608,6 @@ static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr) mp = get_mgr_priv(mgr); - if (mgr->device_changed) { - mgr->device_changed = false; - mp->user_info_dirty = true; - } - if (!mp->user_info_dirty) return; @@ -807,7 +802,6 @@ int dss_mgr_set_device(struct omap_overlay_manager *mgr, dssdev->manager = mgr; mgr->device = dssdev; - mgr->device_changed = true; mutex_unlock(&apply_lock); @@ -840,7 +834,6 @@ int dss_mgr_unset_device(struct omap_overlay_manager *mgr) mgr->device->manager = NULL; mgr->device = NULL; - mgr->device_changed = true; mutex_unlock(&apply_lock); diff --git a/trunk/include/video/omapdss.h b/trunk/include/video/omapdss.h index e629b0de3262..98fc0267dd9e 100644 --- a/trunk/include/video/omapdss.h +++ b/trunk/include/video/omapdss.h @@ -426,8 +426,6 @@ struct omap_overlay_manager { /* dynamic fields */ struct omap_dss_device *device; - bool device_changed; - int (*set_device)(struct omap_overlay_manager *mgr, struct omap_dss_device *dssdev); int (*unset_device)(struct omap_overlay_manager *mgr);