diff options
author | Alan Cox <alan@linux.intel.com> | 2009-09-19 16:13:32 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:32 -0400 |
commit | b58d13a0216d4e0753668214f23e1d2c24c30f8c (patch) | |
tree | e641971a9f1464b7f5a045d4df0e58874b6bf035 /drivers/serial | |
parent | bdc04e3174e18f475289fa8f4144f66686326b7e (diff) |
serial: move port users helper
This little helper is now tty_port specific and useful generally so move it
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index e16d15343dfd..3c45a8d7eb7f 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c | |||
@@ -52,8 +52,6 @@ static struct lock_class_key port_lock_key; | |||
52 | 52 | ||
53 | #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) | 53 | #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) |
54 | 54 | ||
55 | #define uart_users(state) ((state)->port.count + (state)->port.blocked_open) | ||
56 | |||
57 | #ifdef CONFIG_SERIAL_CORE_CONSOLE | 55 | #ifdef CONFIG_SERIAL_CORE_CONSOLE |
58 | #define uart_console(port) ((port)->cons && (port)->cons->index == (port)->line) | 56 | #define uart_console(port) ((port)->cons && (port)->cons->index == (port)->line) |
59 | #else | 57 | #else |
@@ -758,7 +756,7 @@ static int uart_set_info(struct uart_state *state, | |||
758 | /* | 756 | /* |
759 | * Make sure that we are the sole user of this port. | 757 | * Make sure that we are the sole user of this port. |
760 | */ | 758 | */ |
761 | if (uart_users(state) > 1) | 759 | if (tty_port_users(port) > 1) |
762 | goto exit; | 760 | goto exit; |
763 | 761 | ||
764 | /* | 762 | /* |
@@ -974,7 +972,7 @@ static int uart_do_autoconfig(struct uart_state *state) | |||
974 | return -ERESTARTSYS; | 972 | return -ERESTARTSYS; |
975 | 973 | ||
976 | ret = -EBUSY; | 974 | ret = -EBUSY; |
977 | if (uart_users(state) == 1) { | 975 | if (tty_port_users(port) == 1) { |
978 | uart_shutdown(state); | 976 | uart_shutdown(state); |
979 | 977 | ||
980 | /* | 978 | /* |