diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-08-10 21:02:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 11:59:09 -0400 |
commit | 26c5be3c750df6f8a9193d478905627ec75f7f41 (patch) | |
tree | 414dca05e16893bf32ae6ec53b96031b54aa8193 /drivers | |
parent | da909ce4c0df482a43e1e8c827a7d2f169973736 (diff) |
fbcon: uninline four foo_update_attr() functions
This patch uninlines four similar functions, foo_update_attr(), in four
fbcon-related files.
These functions contain loops, two of theam have _nested_ loops, and they
have more than one callsite each. I think they should not be inlined.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/console/bitblit.c | 2 | ||||
-rw-r--r-- | drivers/video/console/fbcon_ccw.c | 2 | ||||
-rw-r--r-- | drivers/video/console/fbcon_cw.c | 2 | ||||
-rw-r--r-- | drivers/video/console/fbcon_ud.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c index af88651b0735..28b1a834906b 100644 --- a/drivers/video/console/bitblit.c +++ b/drivers/video/console/bitblit.c | |||
@@ -22,7 +22,7 @@ | |||
22 | /* | 22 | /* |
23 | * Accelerated handlers. | 23 | * Accelerated handlers. |
24 | */ | 24 | */ |
25 | static inline void update_attr(u8 *dst, u8 *src, int attribute, | 25 | static void update_attr(u8 *dst, u8 *src, int attribute, |
26 | struct vc_data *vc) | 26 | struct vc_data *vc) |
27 | { | 27 | { |
28 | int i, offset = (vc->vc_font.height < 10) ? 1 : 2; | 28 | int i, offset = (vc->vc_font.height < 10) ? 1 : 2; |
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c index d135671d9961..41b32ae23dac 100644 --- a/drivers/video/console/fbcon_ccw.c +++ b/drivers/video/console/fbcon_ccw.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Rotation 270 degrees | 22 | * Rotation 270 degrees |
23 | */ | 23 | */ |
24 | 24 | ||
25 | static inline void ccw_update_attr(u8 *dst, u8 *src, int attribute, | 25 | static void ccw_update_attr(u8 *dst, u8 *src, int attribute, |
26 | struct vc_data *vc) | 26 | struct vc_data *vc) |
27 | { | 27 | { |
28 | int i, j, offset = (vc->vc_font.height < 10) ? 1 : 2; | 28 | int i, j, offset = (vc->vc_font.height < 10) ? 1 : 2; |
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c index 126110f8454f..6a737827beb1 100644 --- a/drivers/video/console/fbcon_cw.c +++ b/drivers/video/console/fbcon_cw.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Rotation 90 degrees | 22 | * Rotation 90 degrees |
23 | */ | 23 | */ |
24 | 24 | ||
25 | static inline void cw_update_attr(u8 *dst, u8 *src, int attribute, | 25 | static void cw_update_attr(u8 *dst, u8 *src, int attribute, |
26 | struct vc_data *vc) | 26 | struct vc_data *vc) |
27 | { | 27 | { |
28 | int i, j, offset = (vc->vc_font.height < 10) ? 1 : 2; | 28 | int i, j, offset = (vc->vc_font.height < 10) ? 1 : 2; |
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c index 93a3e7381b50..ff0872c0498b 100644 --- a/drivers/video/console/fbcon_ud.c +++ b/drivers/video/console/fbcon_ud.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Rotation 180 degrees | 22 | * Rotation 180 degrees |
23 | */ | 23 | */ |
24 | 24 | ||
25 | static inline void ud_update_attr(u8 *dst, u8 *src, int attribute, | 25 | static void ud_update_attr(u8 *dst, u8 *src, int attribute, |
26 | struct vc_data *vc) | 26 | struct vc_data *vc) |
27 | { | 27 | { |
28 | int i, offset = (vc->vc_font.height < 10) ? 1 : 2; | 28 | int i, offset = (vc->vc_font.height < 10) ? 1 : 2; |