drivers: net: irda: bfin_sir: fix compile error
PATCH 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.
--- drivers/net/irda/bfin_sir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/irda/bfin_sir.c +4 -4
@@ -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 *devbfin_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
Hi Samuel,
Would you please take a look at this patch?
Since without this patch, regression test for blackfin will fail:
http://kisskb.ellerman.id.au/kisskb/matrix/
Thank you!
Quoted 59 lines · Bob Liu
From: Sonic Zhang <[email protected]>
Bit IREN is replaced by
UMOD_IRDAandUMOD_MASKsince blackfin 60x added, but this driver didn't update which will causebfin_sirbuild 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]>--- drivers/net/irda/bfin_sir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/net/irda/bfin_sir.c +4
-5@@ -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 *devbfin_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
Signature · 2 lines
Regards, --Bob
Samuel Ortiz
Acked-byHi Bob,
Quoted 7 lines · Bob Liu
Hi Samuel,
Would you please take a look at this patch?
Since without this patch, regression test for blackfin will fail:
http://kisskb.ellerman.id.au/kisskb/matrix/Thank you!
The patch looks fine to me:
Dave, do you want me to carry it and eventually get a pull request from me, or would you prefer to apply it directly ? This is a fix for 3.6.
Cheers,
Samuel.
David Miller
maintainerNetworking patches not sent to netdev will not be properly queued up and tracked, and therefore will not be applied.
Quoted 3 lines · David Miller
Networking patches not sent to netdev will not be properly queued up and tracked, and therefore will not be applied.
Sorry, i've resend one.
Signature · 2 lines
Regards, --Bob