diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-03-12 04:35:16 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-03-12 09:46:52 -0400 |
commit | 694f050650798b82f2c7b9983e80117d58b34bf3 (patch) | |
tree | 4d0591ecc0d83fb36bf2a3a3345a4fba7508b565 | |
parent | 32ed6ef133f95f960d19e3f3b30246aebf8ecd36 (diff) |
videomode: remove timing_entry_index
Display timing's fields have minimum, typical and maximum values. These
can be accessed by using timing_entry_index enum, and
display_timing_get_value() function.
There's no real need for this extra complexity. The values can be
accessed more easily by just using the min/typ/max fields.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
-rw-r--r-- | drivers/video/videomode.c | 18 | ||||
-rw-r--r-- | include/video/display_timing.h | 25 |
2 files changed, 9 insertions, 34 deletions
diff --git a/drivers/video/videomode.c b/drivers/video/videomode.c index 810afff79bc1..a3d95f263cd5 100644 --- a/drivers/video/videomode.c +++ b/drivers/video/videomode.c | |||
@@ -20,16 +20,16 @@ int videomode_from_timing(const struct display_timings *disp, | |||
20 | if (!dt) | 20 | if (!dt) |
21 | return -EINVAL; | 21 | return -EINVAL; |
22 | 22 | ||
23 | vm->pixelclock = display_timing_get_value(&dt->pixelclock, TE_TYP); | 23 | vm->pixelclock = dt->pixelclock.typ; |
24 | vm->hactive = display_timing_get_value(&dt->hactive, TE_TYP); | 24 | vm->hactive = dt->hactive.typ; |
25 | vm->hfront_porch = display_timing_get_value(&dt->hfront_porch, TE_TYP); | 25 | vm->hfront_porch = dt->hfront_porch.typ; |
26 | vm->hback_porch = display_timing_get_value(&dt->hback_porch, TE_TYP); | 26 | vm->hback_porch = dt->hback_porch.typ; |
27 | vm->hsync_len = display_timing_get_value(&dt->hsync_len, TE_TYP); | 27 | vm->hsync_len = dt->hsync_len.typ; |
28 | 28 | ||
29 | vm->vactive = display_timing_get_value(&dt->vactive, TE_TYP); | 29 | vm->vactive = dt->vactive.typ; |
30 | vm->vfront_porch = display_timing_get_value(&dt->vfront_porch, TE_TYP); | 30 | vm->vfront_porch = dt->vfront_porch.typ; |
31 | vm->vback_porch = display_timing_get_value(&dt->vback_porch, TE_TYP); | 31 | vm->vback_porch = dt->vback_porch.typ; |
32 | vm->vsync_len = display_timing_get_value(&dt->vsync_len, TE_TYP); | 32 | vm->vsync_len = dt->vsync_len.typ; |
33 | 33 | ||
34 | vm->flags = dt->flags; | 34 | vm->flags = dt->flags; |
35 | 35 | ||
diff --git a/include/video/display_timing.h b/include/video/display_timing.h index b63471d14097..5d0259b08e01 100644 --- a/include/video/display_timing.h +++ b/include/video/display_timing.h | |||
@@ -39,12 +39,6 @@ struct timing_entry { | |||
39 | u32 max; | 39 | u32 max; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | enum timing_entry_index { | ||
43 | TE_MIN = 0, | ||
44 | TE_TYP = 1, | ||
45 | TE_MAX = 2, | ||
46 | }; | ||
47 | |||
48 | /* | 42 | /* |
49 | * Single "mode" entry. This describes one set of signal timings a display can | 43 | * Single "mode" entry. This describes one set of signal timings a display can |
50 | * have in one setting. This struct can later be converted to struct videomode | 44 | * have in one setting. This struct can later be converted to struct videomode |
@@ -91,25 +85,6 @@ struct display_timings { | |||
91 | struct display_timing **timings; | 85 | struct display_timing **timings; |
92 | }; | 86 | }; |
93 | 87 | ||
94 | /* get value specified by index from struct timing_entry */ | ||
95 | static inline u32 display_timing_get_value(const struct timing_entry *te, | ||
96 | enum timing_entry_index index) | ||
97 | { | ||
98 | switch (index) { | ||
99 | case TE_MIN: | ||
100 | return te->min; | ||
101 | break; | ||
102 | case TE_TYP: | ||
103 | return te->typ; | ||
104 | break; | ||
105 | case TE_MAX: | ||
106 | return te->max; | ||
107 | break; | ||
108 | default: | ||
109 | return te->typ; | ||
110 | } | ||
111 | } | ||
112 | |||
113 | /* get one entry from struct display_timings */ | 88 | /* get one entry from struct display_timings */ |
114 | static inline struct display_timing *display_timings_get(const struct | 89 | static inline struct display_timing *display_timings_get(const struct |
115 | display_timings *disp, | 90 | display_timings *disp, |