hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Blackfin arch: Add return value check in bfin_sir_probe(), remove SSYNC(). 

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Graf Yang 2008-07-19 15:54:10 +08:00 committed by Bryan Wu
parent 262c3825a9
commit aa3348f461
5 changed files with 75 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/asm-blackfin/mach-bf527/bfin_sir.h
View File

@ -118,16 +118,25 @@ static inline void SIR_UART_CLEAR_LSR(struct bfin_sir_port *port)
#define DRIVER_NAME "bfin_sir" #define DRIVER_NAME "bfin_sir"
static void bfin_sir_hw_init(void) static int bfin_sir_hw_init(void)
{ {
int ret = -ENODEV;
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
peripheral_request(P_UART0_TX, DRIVER_NAME); ret = peripheral_request(P_UART0_TX, DRIVER_NAME);
peripheral_request(P_UART0_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART0_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
peripheral_request(P_UART1_TX, DRIVER_NAME); ret = peripheral_request(P_UART1_TX, DRIVER_NAME);
peripheral_request(P_UART1_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART1_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
SSYNC(); return ret;
} }

13
include/asm-blackfin/mach-bf533/bfin_sir.h
View File

@ -110,11 +110,16 @@ static inline void SIR_UART_CLEAR_LSR(struct bfin_sir_port *port)
#define DRIVER_NAME "bfin_sir" #define DRIVER_NAME "bfin_sir"
static void bfin_sir_hw_init(void) static int bfin_sir_hw_init(void)
{ {
int ret = -ENODEV;
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
peripheral_request(P_UART0_TX, DRIVER_NAME); ret = peripheral_request(P_UART0_TX, DRIVER_NAME);
peripheral_request(P_UART0_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART0_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
SSYNC(); return ret;
} }

21
include/asm-blackfin/mach-bf537/bfin_sir.h
View File

@ -118,16 +118,25 @@ static inline void SIR_UART_CLEAR_LSR(struct bfin_sir_port *port)
#define DRIVER_NAME "bfin_sir" #define DRIVER_NAME "bfin_sir"
static void bfin_sir_hw_init(void) static int bfin_sir_hw_init(void)
{ {
int ret = -ENODEV;
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
peripheral_request(P_UART0_TX, DRIVER_NAME); ret = peripheral_request(P_UART0_TX, DRIVER_NAME);
peripheral_request(P_UART0_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART0_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
peripheral_request(P_UART1_TX, DRIVER_NAME); ret = peripheral_request(P_UART1_TX, DRIVER_NAME);
peripheral_request(P_UART1_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART1_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
SSYNC(); return ret;
} }

37
include/asm-blackfin/mach-bf548/bfin_sir.h
View File

@ -124,26 +124,43 @@ struct bfin_sir_self {
#define DRIVER_NAME "bfin_sir" #define DRIVER_NAME "bfin_sir"
static void bfin_sir_hw_init(void) static int bfin_sir_hw_init(void)
{ {
int ret = -ENODEV;
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
peripheral_request(P_UART0_TX, DRIVER_NAME); ret = peripheral_request(P_UART0_TX, DRIVER_NAME);
peripheral_request(P_UART0_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART0_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
#ifdef CONFIG_BFIN_SIR1 #ifdef CONFIG_BFIN_SIR1
peripheral_request(P_UART1_TX, DRIVER_NAME); ret = peripheral_request(P_UART1_TX, DRIVER_NAME);
peripheral_request(P_UART1_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART1_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
#ifdef CONFIG_BFIN_SIR2 #ifdef CONFIG_BFIN_SIR2
peripheral_request(P_UART2_TX, DRIVER_NAME); ret = peripheral_request(P_UART2_TX, DRIVER_NAME);
peripheral_request(P_UART2_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART2_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
#ifdef CONFIG_BFIN_SIR3 #ifdef CONFIG_BFIN_SIR3
peripheral_request(P_UART3_TX, DRIVER_NAME); ret = peripheral_request(P_UART3_TX, DRIVER_NAME);
peripheral_request(P_UART3_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART3_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
SSYNC(); return ret;
} }

13
include/asm-blackfin/mach-bf561/bfin_sir.h
View File

@ -110,11 +110,16 @@ static inline void SIR_UART_CLEAR_LSR(struct bfin_sir_port *port)
#define DRIVER_NAME "bfin_sir" #define DRIVER_NAME "bfin_sir"
static void bfin_sir_hw_init(void) static int bfin_sir_hw_init(void)
{ {
int ret = -ENODEV;
#ifdef CONFIG_BFIN_SIR0 #ifdef CONFIG_BFIN_SIR0
peripheral_request(P_UART0_TX, DRIVER_NAME); ret = peripheral_request(P_UART0_TX, DRIVER_NAME);
peripheral_request(P_UART0_RX, DRIVER_NAME); if (ret)
return ret;
ret = peripheral_request(P_UART0_RX, DRIVER_NAME);
if (ret)
return ret;
#endif #endif
SSYNC(); return ret;
} }