serial: driver for m32 arch should not have DEC alpha errata
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Wed, 4 Jan 2012 20:16:24 +0000 (15:16 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 5 Jan 2012 00:26:32 +0000 (16:26 -0800)
This driver was copied from the original 8250 driver and hence
got the DEC alpha errata workaround.  But the workaround is ugly
and we don't really want it in any more places than it absolutely
needs to be.  Obviously ARCH=m32r means ARCH != alpha, so just
remove the references to the ALPHA_KLUDGE_MCR define.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/tty/serial/m32r_sio.c

index 0801893..94a6792 100644 (file)
@@ -1000,11 +1000,8 @@ static void __init m32r_sio_register_ports(struct uart_driver *drv)
                init_timer(&up->timer);
                up->timer.function = m32r_sio_timeout;
 
-               /*
-                * ALPHA_KLUDGE_MCR needs to be killed.
-                */
-               up->mcr_mask = ~ALPHA_KLUDGE_MCR;
-               up->mcr_force = ALPHA_KLUDGE_MCR;
+               up->mcr_mask = ~0;
+               up->mcr_force = 0;
 
                uart_add_one_port(drv, &up->port);
        }