Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / staging / greybus / uart.c

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 4ffb334..607378b 100644 (file)
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -40,14 +40,6 @@
 #define GB_UART_FIRMWARE_CREDITS       4096
 #define GB_UART_CREDIT_WAIT_TIMEOUT_MSEC       10000
 
-struct gb_tty_line_coding {
-       __le32  rate;
-       __u8    format;
-       __u8    parity;
-       __u8    data_bits;
-       __u8    flow_control;
-};
-
 struct gb_tty {
        struct gbphy_device *gbphy_dev;
        struct tty_port port;
@@ -66,7 +58,7 @@ struct gb_tty {
        struct mutex mutex;
        u8 ctrlin;      /* input control lines */
        u8 ctrlout;     /* output control lines */
-       struct gb_tty_line_coding line_coding;
+       struct gb_uart_set_line_coding_request line_coding;
        struct work_struct tx_work;
        struct kfifo write_fifo;
        bool close_pending;
@@ -288,12 +280,9 @@ static void  gb_uart_tx_write_work(struct work_struct *work)
 
 static int send_line_coding(struct gb_tty *tty)
 {
-       struct gb_uart_set_line_coding_request request;
-
-       memcpy(&request, &tty->line_coding,
-              sizeof(tty->line_coding));
        return gb_operation_sync(tty->connection, GB_UART_TYPE_SET_LINE_CODING,
-                                &request, sizeof(request), NULL, 0);
+                                &tty->line_coding, sizeof(tty->line_coding),
+                                NULL, 0);
 }
 
 static int send_control(struct gb_tty *gb_tty, u8 control)
@@ -493,9 +482,9 @@ static int gb_tty_break_ctl(struct tty_struct *tty, int state)
 static void gb_tty_set_termios(struct tty_struct *tty,
                               struct ktermios *termios_old)
 {
+       struct gb_uart_set_line_coding_request newline;
        struct gb_tty *gb_tty = tty->driver_data;
        struct ktermios *termios = &tty->termios;
-       struct gb_tty_line_coding newline;
        u8 newctrl = gb_tty->ctrlout;
 
        newline.rate = cpu_to_le32(tty_get_baud_rate(tty));