leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

greybus: uart: Remove magic numbers make struct gb_tty variable names consistent

Browse Source 
Use defines for the data format command.
Tidy up naming of gb_tty variables.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Bryan O'Donoghue 2015-06-02 13:40:51 +01:00 committed by Greg Kroah-Hartman
parent 1c087015b9
commit 62229a1bda
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/greybus/uart.c
View File

@ -142,28 +142,28 @@ static int send_line_coding(struct gb_tty *tty)
&request, sizeof(request), NULL, 0); &request, sizeof(request), NULL, 0);
} }
static int send_control(struct gb_tty *tty, u16 control) static int send_control(struct gb_tty *gb_tty, u16 control)
{ {
struct gb_uart_set_control_line_state_request request; struct gb_uart_set_control_line_state_request request;
request.control = cpu_to_le16(control); request.control = cpu_to_le16(control);
return gb_operation_sync(tty->connection, return gb_operation_sync(gb_tty->connection,
GB_UART_TYPE_SET_CONTROL_LINE_STATE, GB_UART_TYPE_SET_CONTROL_LINE_STATE,
&request, sizeof(request), NULL, 0); &request, sizeof(request), NULL, 0);
} }
static int send_break(struct gb_tty *tty, u8 state) static int send_break(struct gb_tty *gb_tty, u8 state)
{ {
struct gb_uart_set_break_request request; struct gb_uart_set_break_request request;
if ((state != 0) && (state != 1)) { if ((state != 0) && (state != 1)) {
dev_err(&tty->connection->dev, dev_err(&gb_tty->connection->dev,
"invalid break state of %d\n", state); "invalid break state of %d\n", state);
return -EINVAL; return -EINVAL;
} }
request.state = state; request.state = state;
return gb_operation_sync(tty->connection, GB_UART_TYPE_SET_BREAK, return gb_operation_sync(gb_tty->connection, GB_UART_TYPE_SET_BREAK,
&request, sizeof(request), NULL, 0); &request, sizeof(request), NULL, 0);
} }
@ -294,7 +294,8 @@ static void gb_tty_set_termios(struct tty_struct *tty,
int newctrl = gb_tty->ctrlout; int newctrl = gb_tty->ctrlout;
newline.rate = cpu_to_le32(tty_get_baud_rate(tty)); newline.rate = cpu_to_le32(tty_get_baud_rate(tty));
newline.format = termios->c_cflag & CSTOPB ? 2 : 0; newline.format = termios->c_cflag & CSTOPB ?
GB_SERIAL_2_STOP_BITS : GB_SERIAL_1_STOP_BITS;
newline.parity = termios->c_cflag & PARENB ? newline.parity = termios->c_cflag & PARENB ?
(termios->c_cflag & PARODD ? 1 : 2) + (termios->c_cflag & PARODD ? 1 : 2) +
(termios->c_cflag & CMSPAR ? 2 : 0) : 0; (termios->c_cflag & CMSPAR ? 2 : 0) : 0;