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>
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
#include <linux/svga.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/console.h> /* Why should fb driver call console functions? because acquire_console_sem() */
|
||||
#include <linux/console.h> /* Why should fb driver call console functions? because console_lock() */
|
||||
#include <video/vga.h>
|
||||
|
||||
#ifdef CONFIG_MTRR
|
||||
@@ -819,12 +819,12 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
|
||||
|
||||
dev_info(info->device, "suspend\n");
|
||||
|
||||
acquire_console_sem();
|
||||
console_lock();
|
||||
mutex_lock(&(par->open_lock));
|
||||
|
||||
if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) {
|
||||
mutex_unlock(&(par->open_lock));
|
||||
release_console_sem();
|
||||
console_unlock();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -835,7 +835,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
|
||||
pci_set_power_state(dev, pci_choose_state(dev, state));
|
||||
|
||||
mutex_unlock(&(par->open_lock));
|
||||
release_console_sem();
|
||||
console_unlock();
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -850,7 +850,7 @@ static int vt8623_pci_resume(struct pci_dev* dev)
|
||||
|
||||
dev_info(info->device, "resume\n");
|
||||
|
||||
acquire_console_sem();
|
||||
console_lock();
|
||||
mutex_lock(&(par->open_lock));
|
||||
|
||||
if (par->ref_count == 0)
|
||||
@@ -869,7 +869,7 @@ static int vt8623_pci_resume(struct pci_dev* dev)
|
||||
|
||||
fail:
|
||||
mutex_unlock(&(par->open_lock));
|
||||
release_console_sem();
|
||||
console_unlock();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user