diff options
author | Torben Hohn <torbenh@gmx.de> | 2011-01-25 18:07:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-25 19:50:06 -0500 |
commit | ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff (patch) | |
tree | e2d3f799e20e2cbca80891ea17af7484f21d628f /drivers/video/da8xx-fb.c | |
parent | 3689456b4bd36027022b3215eb2acba51cd0e6b5 (diff) |
console: rename acquire/release_console_sem() to console_lock/unlock()
The -rt patches change the console_semaphore to console_mutex. As a
result, a quite large chunk of the patches changes all
acquire/release_console_sem() to acquire/release_console_mutex()
This commit makes things use more neutral function names which dont make
implications about the underlying lock.
The only real change is the return value of console_trylock which is
inverted from try_acquire_console_sem()
This patch also paves the way to switching console_sem from a semaphore to
a mutex.
[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]
Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Thomas Gleixner <tglx@tglx.de>
Cc: Greg KH <gregkh@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/da8xx-fb.c')
-rw-r--r-- | drivers/video/da8xx-fb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 520047ac6e3e..8d61ef96eedd 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c | |||
@@ -1131,14 +1131,14 @@ static int fb_suspend(struct platform_device *dev, pm_message_t state) | |||
1131 | struct fb_info *info = platform_get_drvdata(dev); | 1131 | struct fb_info *info = platform_get_drvdata(dev); |
1132 | struct da8xx_fb_par *par = info->par; | 1132 | struct da8xx_fb_par *par = info->par; |
1133 | 1133 | ||
1134 | acquire_console_sem(); | 1134 | console_lock(); |
1135 | if (par->panel_power_ctrl) | 1135 | if (par->panel_power_ctrl) |
1136 | par->panel_power_ctrl(0); | 1136 | par->panel_power_ctrl(0); |
1137 | 1137 | ||
1138 | fb_set_suspend(info, 1); | 1138 | fb_set_suspend(info, 1); |
1139 | lcd_disable_raster(); | 1139 | lcd_disable_raster(); |
1140 | clk_disable(par->lcdc_clk); | 1140 | clk_disable(par->lcdc_clk); |
1141 | release_console_sem(); | 1141 | console_unlock(); |
1142 | 1142 | ||
1143 | return 0; | 1143 | return 0; |
1144 | } | 1144 | } |
@@ -1147,14 +1147,14 @@ static int fb_resume(struct platform_device *dev) | |||
1147 | struct fb_info *info = platform_get_drvdata(dev); | 1147 | struct fb_info *info = platform_get_drvdata(dev); |
1148 | struct da8xx_fb_par *par = info->par; | 1148 | struct da8xx_fb_par *par = info->par; |
1149 | 1149 | ||
1150 | acquire_console_sem(); | 1150 | console_lock(); |
1151 | if (par->panel_power_ctrl) | 1151 | if (par->panel_power_ctrl) |
1152 | par->panel_power_ctrl(1); | 1152 | par->panel_power_ctrl(1); |
1153 | 1153 | ||
1154 | clk_enable(par->lcdc_clk); | 1154 | clk_enable(par->lcdc_clk); |
1155 | lcd_enable_raster(); | 1155 | lcd_enable_raster(); |
1156 | fb_set_suspend(info, 0); | 1156 | fb_set_suspend(info, 0); |
1157 | release_console_sem(); | 1157 | console_unlock(); |
1158 | 1158 | ||
1159 | return 0; | 1159 | return 0; |
1160 | } | 1160 | } |