ARM: 5796/1: SA1100: h3600: remove IRDA bits from serial PM callback
authorDmitry Artamonow <mad_soft@inbox.ru>
Fri, 27 Nov 2009 10:10:58 +0000 (11:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 16:52:25 +0000 (16:52 +0000)
IRDA is handled by separate sa1100-ir driver and has
nothing to do with sa1100_serial

Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-sa1100/h3600.c

index ebb3b8dcee563e30874be779b27377a878e39a45..5033c030a3f24f0c296d16e1c94aaf341cd61212 100644 (file)
@@ -155,11 +155,8 @@ static u_int h3xxx_uart_get_mctrl(struct uart_port *port)
 
 static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate)
 {
-       if (port->mapbase == _Ser2UTCR0) { /* TODO: REMOVE THIS */
-               assign_h3600_egpio(IPAQ_EGPIO_IR_ON, !state);
-       } else if (port->mapbase == _Ser3UTCR0) {
+       if (port->mapbase == _Ser3UTCR0)
                assign_h3600_egpio(IPAQ_EGPIO_RS232_ON, !state);
-       }
 }
 
 /*