Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac751efa authored by Torben Hohn's avatar Torben Hohn Committed by Linus Torvalds
Browse files

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: default avatarTorben 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3689456b

arch/arm/mach-omap2/pm24xx.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void omap2_enter_full_retention(void) 


	/* Block console output in case it is on one of the OMAP UARTs */

	if (!is_suspending())

		if (try_acquire_console_sem())

		if (!console_trylock())

			goto no_sleep;



	omap_uart_prepare_idle(0);
@@ -151,7 +151,7 @@ static void omap2_enter_full_retention(void) 
	omap_uart_resume_idle(0);



	if (!is_suspending())

		release_console_sem();

		console_unlock();



no_sleep:

	if (omap2_pm_debug) {

arch/arm/mach-omap2/pm34xx.c

+2 −2
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ void omap_sram_idle(void) 
	if (!is_suspending())

		if (per_next_state < PWRDM_POWER_ON ||

		    core_next_state < PWRDM_POWER_ON)

			if (try_acquire_console_sem())

			if (!console_trylock())

				goto console_still_active;



	/* PER */
@@ -481,7 +481,7 @@ void omap_sram_idle(void) 
	}



	if (!is_suspending())

		release_console_sem();

		console_unlock();



console_still_active:

	/* Disable IO-PAD and IO-CHAIN wakeup */

arch/arm/mach-omap2/serial.c

+2 −2
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) 


	oh->dev_attr = uart;



	acquire_console_sem(); /* in case the earlycon is on the UART */

	console_lock(); /* in case the earlycon is on the UART */



	/*

	 * Because of early UART probing, UART did not get idled
@@ -838,7 +838,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata) 
	omap_uart_block_sleep(uart);

	uart->timeout = DEFAULT_TIMEOUT;



	release_console_sem();

	console_unlock();



	if ((cpu_is_omap34xx() && uart->padconf) ||

	    (uart->wk_en && uart->wk_mask)) {

arch/parisc/kernel/pdc_cons.c

+2 −2
Original line number Diff line number Diff line
@@ -169,11 +169,11 @@ static int __init pdc_console_tty_driver_init(void) 


	struct console *tmp;



	acquire_console_sem();

	console_lock();

	for_each_console(tmp)

		if (tmp == &pdc_cons)

			break;

	release_console_sem();

	console_unlock();



	if (!tmp) {

		printk(KERN_INFO "PDC console driver not registered anymore, not creating %s\n", pdc_cons.name);

drivers/char/bfin_jtag_comm.c

+4 −4
Original line number Diff line number Diff line
@@ -183,16 +183,16 @@ bfin_jc_circ_write(const unsigned char *buf, int count) 
}



#ifndef CONFIG_BFIN_JTAG_COMM_CONSOLE

# define acquire_console_sem()

# define release_console_sem()

# define console_lock()

# define console_unlock()

#endif

static int

bfin_jc_write(struct tty_struct *tty, const unsigned char *buf, int count)

{

	int i;

	acquire_console_sem();

	console_lock();

	i = bfin_jc_circ_write(buf, count);

	release_console_sem();

	console_unlock();

	wake_up_process(bfin_jc_kthread);

	return i;

}