diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-15 05:04:43 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 01:54:39 -0500 |
commit | d09c7aa8989caf44e8754e8aa81ce80217a0e98a (patch) | |
tree | 7502039f5b809c485fc85d7eabf63bb8e8a0abfc /drivers/video | |
parent | 063fd701abba3b58c36b6043d5feacf0fdc76cbd (diff) |
OMAPDSS: APPLY: rename dss_cache to dss_data
dss_cache struct contains private data used to manage dispc. "cache" is
not a good word for it, so rename it to dss_data.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/omap2/dss/apply.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index a2c6c50430ee..64f9997e5d01 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c | |||
@@ -38,7 +38,7 @@ | |||
38 | * apply() | 38 | * apply() |
39 | * v | 39 | * v |
40 | * +--------------------+ | 40 | * +--------------------+ |
41 | * | dss_cache | | 41 | * | info | |
42 | * +--------------------+ | 42 | * +--------------------+ |
43 | * v | 43 | * v |
44 | * write_regs() | 44 | * write_regs() |
@@ -93,19 +93,19 @@ static struct { | |||
93 | struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS]; | 93 | struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS]; |
94 | 94 | ||
95 | bool irq_enabled; | 95 | bool irq_enabled; |
96 | } dss_cache; | 96 | } dss_data; |
97 | 97 | ||
98 | /* protects dss_cache */ | 98 | /* protects dss_data */ |
99 | static spinlock_t data_lock; | 99 | static spinlock_t data_lock; |
100 | 100 | ||
101 | static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl) | 101 | static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl) |
102 | { | 102 | { |
103 | return &dss_cache.ovl_priv_data_array[ovl->id]; | 103 | return &dss_data.ovl_priv_data_array[ovl->id]; |
104 | } | 104 | } |
105 | 105 | ||
106 | static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr) | 106 | static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr) |
107 | { | 107 | { |
108 | return &dss_cache.mgr_priv_data_array[mgr->id]; | 108 | return &dss_data.mgr_priv_data_array[mgr->id]; |
109 | } | 109 | } |
110 | 110 | ||
111 | void dss_apply_init(void) | 111 | void dss_apply_init(void) |
@@ -433,7 +433,7 @@ static void dss_register_vsync_isr(void) | |||
433 | r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask); | 433 | r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask); |
434 | WARN_ON(r); | 434 | WARN_ON(r); |
435 | 435 | ||
436 | dss_cache.irq_enabled = true; | 436 | dss_data.irq_enabled = true; |
437 | } | 437 | } |
438 | 438 | ||
439 | static void dss_unregister_vsync_isr(void) | 439 | static void dss_unregister_vsync_isr(void) |
@@ -449,7 +449,7 @@ static void dss_unregister_vsync_isr(void) | |||
449 | r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask); | 449 | r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask); |
450 | WARN_ON(r); | 450 | WARN_ON(r); |
451 | 451 | ||
452 | dss_cache.irq_enabled = false; | 452 | dss_data.irq_enabled = false; |
453 | } | 453 | } |
454 | 454 | ||
455 | static void dss_apply_irq_handler(void *data, u32 mask) | 455 | static void dss_apply_irq_handler(void *data, u32 mask) |
@@ -637,7 +637,7 @@ int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) | |||
637 | 637 | ||
638 | r = 0; | 638 | r = 0; |
639 | if (mgr->enabled && !mgr_manual_update(mgr)) { | 639 | if (mgr->enabled && !mgr_manual_update(mgr)) { |
640 | if (!dss_cache.irq_enabled) | 640 | if (!dss_data.irq_enabled) |
641 | dss_register_vsync_isr(); | 641 | dss_register_vsync_isr(); |
642 | 642 | ||
643 | dss_write_regs(); | 643 | dss_write_regs(); |