aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehan Webster <[email protected]>2014-09-26 18:10:53 -0700
committerTomi Valkeinen <[email protected]>2014-09-30 13:11:53 +0300
commitc8b8888f097c7df260cf5beaf2e3a325660a16a4 (patch)
tree34be71427db78e6f2cd8a111170665ac728b8684
parent032e57f01b7524ad9aec39788b38f523583ab58e (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 <[email protected]> Suggested-by: Arnd Bergmann <[email protected]> Cc: Arnd Bergmann <[email protected]> Reviewed-by: Felipe Balbi <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
-rw-r--r--drivers/video/fbdev/omap2/omapfb/omapfb-main.c14
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[] = {
},
};
+static bool cmp_component(struct fb_bitfield *f1, struct fb_bitfield *f2)
+{
+ return f1->length == f2->length &&
+ f1->offset == f2->offset &&
+ f1->msb_right == f2->msb_right;
+}
+
static bool cmp_var_to_colormode(struct fb_var_screeninfo *var,
struct omapfb_colormode *color)
{
- bool cmp_component(struct fb_bitfield *f1, struct fb_bitfield *f2)
- {
- return f1->length == f2->length &&
- f1->offset == f2->offset &&
- f1->msb_right == f2->msb_right;
- }
-
if (var->bits_per_pixel == 0 ||
var->red.length == 0 ||
var->blue.length == 0 ||