* [RESEND][PATCH] drivers: net: irda: bfin_sir: fix compile error
@ 2012-08-07 2:08 Bob Liu
2012-08-08 22:40 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Bob Liu @ 2012-08-07 2:08 UTC (permalink / raw)
To: davem
Cc: samuel, rmk+kernel, gregkh, kuninori.morimoto.gx, linux-kernel,
uclinux-dist-devel, netdev, Sonic Zhang, Bob Liu
From: Sonic Zhang <sonic.zhang@analog.com>
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 <sonic.zhang@analog.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Acked-by: Samuel Ortiz <samuel@sortiz.org>
---
drivers/net/irda/bfin_sir.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
index a561ae4..c6a0299 100644
--- a/drivers/net/irda/bfin_sir.c
+++ b/drivers/net/irda/bfin_sir.c
@@ -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); */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RESEND][PATCH] drivers: net: irda: bfin_sir: fix compile error
2012-08-07 2:08 [RESEND][PATCH] drivers: net: irda: bfin_sir: fix compile error Bob Liu
@ 2012-08-08 22:40 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-08-08 22:40 UTC (permalink / raw)
To: lliubbo
Cc: samuel, rmk+kernel, gregkh, kuninori.morimoto.gx, linux-kernel,
uclinux-dist-devel, netdev, sonic.zhang
From: Bob Liu <lliubbo@gmail.com>
Date: Tue, 7 Aug 2012 10:08:36 +0800
> From: Sonic Zhang <sonic.zhang@analog.com>
>
> 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 <sonic.zhang@analog.com>
> Signed-off-by: Bob Liu <lliubbo@gmail.com>
> Acked-by: Samuel Ortiz <samuel@sortiz.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-08 22:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-07 2:08 [RESEND][PATCH] drivers: net: irda: bfin_sir: fix compile error Bob Liu
2012-08-08 22:40 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.