SPIN_LOCK_UNLOCKED cleanup in drivers/serial
SPIN_LOCK_UNLOCKED cleanup,use __SPIN_LOCK_UNLOCKED instead Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ccc942567e
commit
076fa0fa2d
|
@ -934,7 +934,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
|
|||
.irq = SMC1_IRQ,
|
||||
.ops = &cpm_uart_pops,
|
||||
.iotype = UPIO_MEM,
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SMC1].port.lock),
|
||||
},
|
||||
.flags = FLAG_SMC,
|
||||
.tx_nrfifos = TX_NUM_FIFO,
|
||||
|
@ -948,7 +948,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
|
|||
.irq = SMC2_IRQ,
|
||||
.ops = &cpm_uart_pops,
|
||||
.iotype = UPIO_MEM,
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SMC2].port.lock),
|
||||
},
|
||||
.flags = FLAG_SMC,
|
||||
.tx_nrfifos = TX_NUM_FIFO,
|
||||
|
@ -965,7 +965,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
|
|||
.irq = SCC1_IRQ,
|
||||
.ops = &cpm_uart_pops,
|
||||
.iotype = UPIO_MEM,
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC1].port.lock),
|
||||
},
|
||||
.tx_nrfifos = TX_NUM_FIFO,
|
||||
.tx_fifosize = TX_BUF_SIZE,
|
||||
|
@ -979,7 +979,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
|
|||
.irq = SCC2_IRQ,
|
||||
.ops = &cpm_uart_pops,
|
||||
.iotype = UPIO_MEM,
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC2].port.lock),
|
||||
},
|
||||
.tx_nrfifos = TX_NUM_FIFO,
|
||||
.tx_fifosize = TX_BUF_SIZE,
|
||||
|
@ -993,7 +993,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
|
|||
.irq = SCC3_IRQ,
|
||||
.ops = &cpm_uart_pops,
|
||||
.iotype = UPIO_MEM,
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC3].port.lock),
|
||||
},
|
||||
.tx_nrfifos = TX_NUM_FIFO,
|
||||
.tx_fifosize = TX_BUF_SIZE,
|
||||
|
@ -1007,7 +1007,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
|
|||
.irq = SCC4_IRQ,
|
||||
.ops = &cpm_uart_pops,
|
||||
.iotype = UPIO_MEM,
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(cpm_uart_ports[UART_SCC4].port.lock),
|
||||
},
|
||||
.tx_nrfifos = TX_NUM_FIFO,
|
||||
.tx_fifosize = TX_BUF_SIZE,
|
||||
|
|
|
@ -957,7 +957,7 @@ static struct uart_driver s3c24xx_uart_drv = {
|
|||
static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
|
||||
[0] = {
|
||||
.port = {
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[0].port.lock),
|
||||
.iotype = UPIO_MEM,
|
||||
.irq = IRQ_S3CUART_RX0,
|
||||
.uartclk = 0,
|
||||
|
@ -969,7 +969,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
|
|||
},
|
||||
[1] = {
|
||||
.port = {
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[1].port.lock),
|
||||
.iotype = UPIO_MEM,
|
||||
.irq = IRQ_S3CUART_RX1,
|
||||
.uartclk = 0,
|
||||
|
@ -983,7 +983,7 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
|
|||
|
||||
[2] = {
|
||||
.port = {
|
||||
.lock = SPIN_LOCK_UNLOCKED,
|
||||
.lock = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[2].port.lock),
|
||||
.iotype = UPIO_MEM,
|
||||
.irq = IRQ_S3CUART_RX2,
|
||||
.uartclk = 0,
|
||||
|
|
Loading…
Reference in a new issue