Skip to contentSkip to conversation

drivers: net: irda: bfin_sir: fix compile error

PATCH RESEND Applied Bob Liu 2 participants 2 messages Aug 7, 2012 – Aug 8, 2012

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Bob Liu

author
#0 lore raw

PATCH RESEND 1/1 drivers: net: irda: bfin_sir: fix compile error

From: Sonic Zhang <[email protected]>

Bit IREN is replaced by UMOD_IRDA and UMOD_MASK since blackfin 60x added, but this driver didn't update which will cause bfin_sir build error:

drivers/net/irda/bfin_sir.c:161:9: error: 'IREN' undeclared (first use in this function)
drivers/net/irda/bfin_sir.c:435:18: error: 'IREN' undeclared (first use in this function)
drivers/net/irda/bfin_sir.c:521:11: error: 'IREN' undeclared (first use in this function)

This patch fix it.

Signed-off-by Sonic Zhang <[email protected]>
Signed-off-by Bob Liu <[email protected]>
Acked-by Samuel Ortiz <[email protected]>
---
 drivers/net/irda/bfin_sir.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/irda/bfin_sir.c +4 -4
index a561ae4..c6a0299 100644
@@ -158,7 +158,7 @@ static int bfin_sir_set_speed(struct bfin_sir_port *port, int speed)
 	/* If not add the 'RPOLC', we can't catch the receive interrupt.
 	 * It's related with the HW layout and the IR transiver.
 	 */
-	val |= IREN | RPOLC;
+	val |= UMOD_IRDA | RPOLC;
 	UART_PUT_GCTL(port, val);
 	return ret;
 }

@@ -432,7 +432,7 @@ static void bfin_sir_shutdown(struct bfin_sir_port *port, struct net_device *dev
 	bfin_sir_stop_rx(port);
 
 	val = UART_GET_GCTL(port);
-	val &= ~(UCEN | IREN | RPOLC);
+	val &= ~(UCEN | UMOD_MASK | RPOLC);
 	UART_PUT_GCTL(port, val);
 
 #ifdef CONFIG_SIR_BFIN_DMA

@@ -518,10 +518,10 @@ static void bfin_sir_send_work(struct work_struct *work)
 	 * reset all the UART.
 	 */
 	val = UART_GET_GCTL(port);
-	val &= ~(IREN | RPOLC);
+	val &= ~(UMOD_MASK | RPOLC);
 	UART_PUT_GCTL(port, val);
 	SSYNC();
-	val |= IREN | RPOLC;
+	val |= UMOD_IRDA | RPOLC;
 	UART_PUT_GCTL(port, val);
 	SSYNC();
 	/* bfin_sir_set_speed(port, self->speed); */
Signature · 1 line
1.7.9.5
maintainer Applied
#1 lore raw

From: Bob Liu <[email protected]>
Date: Tue, 7 Aug 2012 10:08:36 +0800

Quoted 12 lines

From: Sonic Zhang <[email protected]>

Bit IREN is replaced by UMOD_IRDA and UMOD_MASK since blackfin 60x added, but this driver didn't update which will cause bfin_sir build error:

drivers/net/irda/bfin_sir.c:161:9: error: 'IREN' undeclared (first use in this function)
drivers/net/irda/bfin_sir.c:435:18: error: 'IREN' undeclared (first use in this function)
drivers/net/irda/bfin_sir.c:521:11: error: 'IREN' undeclared (first use in this function)

Quoted 5 lines

This patch fix it.

Signed-off-by Sonic Zhang <[email protected]>
Signed-off-by Bob Liu <[email protected]>
Acked-by Samuel Ortiz <[email protected]>

Applied, thanks.