Remove code guarded by #ifdef VIZZINI_IWA, not defined anywhere

diff --git a/vizzini.c b/vizzini.c
index bbd78bd66af2088289747e43a3be4119c0558821..b0b30d758c26dad9605d89506189a973c1b8d7a6 100644 (file)
--- a/vizzini.c
+++ b/vizzini.c
@@ -1120,17 +1120,6 @@ static void acm_tty_set_termios(struct tty_struct *tty,
                 format_stop = UART_FORMAT_STOP_1;
         }
 
                 format_stop = UART_FORMAT_STOP_1;
         }
 

-#ifdef VIZZINI_IWA
-        if (format_size == UART_FORMAT_SIZE_8) {
-                acm->iwa = format_parity;
-                if (portdata->iwa != UART_FORMAT_PARITY_NONE) {
-                        format_size = UART_FORMAT_SIZE_9;
-                        format_parity = UART_FORMAT_PARITY_NONE;
-                }
-        } else {
-                acm->iwa = UART_FORMAT_PARITY_NONE;
-        }
-#endif

         vizzini_set_reg(acm, block, UART_FORMAT, format_size | format_parity | format_stop);
 
         if (cflag & CRTSCTS) {
         vizzini_set_reg(acm, block, UART_FORMAT, format_size | format_parity | format_stop);
 
         if (cflag & CRTSCTS) {


@@ -1156,10 +1145,6 @@ static void acm_tty_set_termios(struct tty_struct *tty,
         if (acm->trans9) {
                 /* Turn on wide mode if we're 9-bit transparent. */
                 vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 1);
         if (acm->trans9) {
                 /* Turn on wide mode if we're 9-bit transparent. */
                 vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 1);

-#ifdef VIZZINI_IWA
-        } else if (acm->iwa != UART_FORMAT_PARITY_NONE) {
-                vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 1);
-#endif

         } else if (!acm->preciseflags) {
                 /* Turn off wide mode unless we have precise flags. */
                 vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 0);
         } else if (!acm->preciseflags) {
                 /* Turn off wide mode unless we have precise flags. */
                 vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 0);

diff --git a/vizzini.h b/vizzini.h
index a433bf029b6c9365aba209351fc97a0312342ba2..3470ce148ab08ce4d61fe28950dd64a6c3378afe 100644 (file)
--- a/vizzini.h
+++ b/vizzini.h
@@ -202,10 +202,6 @@ struct acm {
         int           preciseflags; /* USB: wide mode, TTY: flags per character */
         int           trans9;   /* USB: wide mode, serial 9N1 */
 
         int           preciseflags; /* USB: wide mode, TTY: flags per character */
         int           trans9;   /* USB: wide mode, serial 9N1 */
 

-#ifdef VIZZINI_IWA
-        int           iwa;
-#endif
-

 };
 
 #define CDC_DATA_INTERFACE_TYPE        0x0a
 };
 
 #define CDC_DATA_INTERFACE_TYPE        0x0a