diff options
author | Behan Webster <behanw@converseincode.com> | 2014-09-26 21:10:53 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-09-30 06:11:53 -0400 |
commit | c8b8888f097c7df260cf5beaf2e3a325660a16a4 (patch) | |
tree | 34be71427db78e6f2cd8a111170665ac728b8684 /drivers/video | |
parent | 032e57f01b7524ad9aec39788b38f523583ab58e (diff) |
arm, fbdev, omap2, LLVMLinux: Remove nested function from omapfb
Replace the use of nested functions where a normal function will suffice.
Nested functions are not liked by upstream kernel developers in general. Their
use breaks the use of clang as a compiler, and doesn't make the code any
better.
This code now works for both gcc and clang.
Signed-off-by: Behan Webster <behanw@converseincode.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c index ec2d132c782d..15872433e0c6 100644 --- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c +++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c | |||
@@ -273,16 +273,16 @@ static struct omapfb_colormode omapfb_colormodes[] = { | |||
273 | }, | 273 | }, |
274 | }; | 274 | }; |
275 | 275 | ||
276 | static bool cmp_component(struct fb_bitfield *f1, struct fb_bitfield *f2) | ||
277 | { | ||
278 | return f1->length == f2->length && | ||
279 | f1->offset == f2->offset && | ||
280 | f1->msb_right == f2->msb_right; | ||
281 | } | ||
282 | |||
276 | static bool cmp_var_to_colormode(struct fb_var_screeninfo *var, | 283 | static bool cmp_var_to_colormode(struct fb_var_screeninfo *var, |
277 | struct omapfb_colormode *color) | 284 | struct omapfb_colormode *color) |
278 | { | 285 | { |
279 | bool cmp_component(struct fb_bitfield *f1, struct fb_bitfield *f2) | ||
280 | { | ||
281 | return f1->length == f2->length && | ||
282 | f1->offset == f2->offset && | ||
283 | f1->msb_right == f2->msb_right; | ||
284 | } | ||
285 | |||
286 | if (var->bits_per_pixel == 0 || | 286 | if (var->bits_per_pixel == 0 || |
287 | var->red.length == 0 || | 287 | var->red.length == 0 || |
288 | var->blue.length == 0 || | 288 | var->blue.length == 0 || |