Commit ba4cfe03 authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds

[PATCH] initialize a spin lock in CPM2 uart driver

Static initialization of spin locks that are otherwise accessed prior to
initialization.
Signed-off-by: default avatarJaka Mocnik <jaka@activetools.si>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 998a5a63
...@@ -864,6 +864,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { ...@@ -864,6 +864,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.irq = SMC1_IRQ, .irq = SMC1_IRQ,
.ops = &cpm_uart_pops, .ops = &cpm_uart_pops,
.iotype = SERIAL_IO_MEM, .iotype = SERIAL_IO_MEM,
.lock = SPIN_LOCK_UNLOCKED,
}, },
.flags = FLAG_SMC, .flags = FLAG_SMC,
.tx_nrfifos = TX_NUM_FIFO, .tx_nrfifos = TX_NUM_FIFO,
...@@ -877,6 +878,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { ...@@ -877,6 +878,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.irq = SMC2_IRQ, .irq = SMC2_IRQ,
.ops = &cpm_uart_pops, .ops = &cpm_uart_pops,
.iotype = SERIAL_IO_MEM, .iotype = SERIAL_IO_MEM,
.lock = SPIN_LOCK_UNLOCKED,
}, },
.flags = FLAG_SMC, .flags = FLAG_SMC,
.tx_nrfifos = TX_NUM_FIFO, .tx_nrfifos = TX_NUM_FIFO,
...@@ -893,6 +895,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { ...@@ -893,6 +895,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.irq = SCC1_IRQ, .irq = SCC1_IRQ,
.ops = &cpm_uart_pops, .ops = &cpm_uart_pops,
.iotype = SERIAL_IO_MEM, .iotype = SERIAL_IO_MEM,
.lock = SPIN_LOCK_UNLOCKED,
}, },
.tx_nrfifos = TX_NUM_FIFO, .tx_nrfifos = TX_NUM_FIFO,
.tx_fifosize = TX_BUF_SIZE, .tx_fifosize = TX_BUF_SIZE,
...@@ -905,6 +908,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { ...@@ -905,6 +908,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.irq = SCC2_IRQ, .irq = SCC2_IRQ,
.ops = &cpm_uart_pops, .ops = &cpm_uart_pops,
.iotype = SERIAL_IO_MEM, .iotype = SERIAL_IO_MEM,
.lock = SPIN_LOCK_UNLOCKED,
}, },
.tx_nrfifos = TX_NUM_FIFO, .tx_nrfifos = TX_NUM_FIFO,
.tx_fifosize = TX_BUF_SIZE, .tx_fifosize = TX_BUF_SIZE,
...@@ -917,6 +921,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { ...@@ -917,6 +921,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.irq = SCC3_IRQ, .irq = SCC3_IRQ,
.ops = &cpm_uart_pops, .ops = &cpm_uart_pops,
.iotype = SERIAL_IO_MEM, .iotype = SERIAL_IO_MEM,
.lock = SPIN_LOCK_UNLOCKED,
}, },
.tx_nrfifos = TX_NUM_FIFO, .tx_nrfifos = TX_NUM_FIFO,
.tx_fifosize = TX_BUF_SIZE, .tx_fifosize = TX_BUF_SIZE,
...@@ -929,6 +934,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { ...@@ -929,6 +934,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.irq = SCC4_IRQ, .irq = SCC4_IRQ,
.ops = &cpm_uart_pops, .ops = &cpm_uart_pops,
.iotype = SERIAL_IO_MEM, .iotype = SERIAL_IO_MEM,
.lock = SPIN_LOCK_UNLOCKED,
}, },
.tx_nrfifos = TX_NUM_FIFO, .tx_nrfifos = TX_NUM_FIFO,
.tx_fifosize = TX_BUF_SIZE, .tx_fifosize = TX_BUF_SIZE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment