From: Dmitry Artamonow Date: Fri, 27 Nov 2009 10:10:58 +0000 (+0100) Subject: ARM: 5796/1: SA1100: h3600: remove IRDA bits from serial PM callback X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a151a0f12b136d28f0501fa294462f8e9e310a1;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git ARM: 5796/1: SA1100: h3600: remove IRDA bits from serial PM callback IRDA is handled by separate sa1100-ir driver and has nothing to do with sa1100_serial Signed-off-by: Dmitry Artamonow Signed-off-by: Russell King --- diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index ebb3b8dcee5..5033c030a3f 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c @@ -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); - } } /*