[PATCH tty-next] serial: sirf: Fix compilation failure

[PATCH tty-next] serial: sirf: Fix compilation failure

[Daniel Thompson]

After 07d410e0) serial: sirf: fix spinlock deadlock issue it is no longer
possiblet to compile this driver. The rename of one of the spinlocks is
faulty. After looking at the original patch I believe this is the correct
fix.

Compile tested using ARM's multi_v7_defconfig

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Barry Song <baohua@kernel.org>
Cc: Qipan Li <Qipan.Li@csr.com>
Cc: linux-serial at vger.kernel.org
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
---

Notes:
    Sorry to resend within a few minutes. Patch is identical to parent but the
    subject line has been corrected. The original 'v6' was just utterly
    wrong! This patch is a not-previously-shared patch to fix a build
    regression that appears in tty-next.

 drivers/tty/serial/sirfsoc_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 236f892..1f2be48 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -704,7 +704,7 @@ static void sirfsoc_uart_rx_dma_complete_tl(unsigned long param)
 	struct sirfsoc_int_en *uint_en = &sirfport->uart_reg->uart_int_en;
 	unsigned long flags;
 	struct dma_tx_state tx_state;
-	spin_lock_irqsave(&port->rx_lock, flags);
+	spin_lock_irqsave(&port->lock, flags);
 	while (DMA_COMPLETE == dmaengine_tx_status(sirfport->rx_dma_chan,
 			sirfport->rx_dma_items[sirfport->rx_completed].cookie, &tx_state)) {
 		sirfsoc_uart_insert_rx_buf_to_tty(sirfport,
-- 
1.9.0

[PATCH tty-next] serial: sirf: Fix compilation failure

[Barry Song]

2014-05-29 18:13 GMT+08:00 Daniel Thompson <daniel.thompson@linaro.org>:
> After 07d410e0) serial: sirf: fix spinlock deadlock issue it is no longer
> possiblet to compile this driver. The rename of one of the spinlocks is
> faulty. After looking at the original patch I believe this is the correct
> fix.
>
> Compile tested using ARM's multi_v7_defconfig
>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jiri Slaby <jslaby@suse.cz>
> Cc: Barry Song <baohua@kernel.org>
> Cc: Qipan Li <Qipan.Li@csr.com>
> Cc: linux-serial at vger.kernel.org
> Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>

Qipan prepared a same patch to fix this. since you have sent,

Acked-by: Barry Song <baohua@kernel.org>


> ---
>
> Notes:
>     Sorry to resend within a few minutes. Patch is identical to parent but the
>     subject line has been corrected. The original 'v6' was just utterly
>     wrong! This patch is a not-previously-shared patch to fix a build
>     regression that appears in tty-next.
>
>  drivers/tty/serial/sirfsoc_uart.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
> index 236f892..1f2be48 100644
> --- a/drivers/tty/serial/sirfsoc_uart.c
> +++ b/drivers/tty/serial/sirfsoc_uart.c
> @@ -704,7 +704,7 @@ static void sirfsoc_uart_rx_dma_complete_tl(unsigned long param)
>         struct sirfsoc_int_en *uint_en = &sirfport->uart_reg->uart_int_en;
>         unsigned long flags;
>         struct dma_tx_state tx_state;
> -       spin_lock_irqsave(&port->rx_lock, flags);
> +       spin_lock_irqsave(&port->lock, flags);
>         while (DMA_COMPLETE == dmaengine_tx_status(sirfport->rx_dma_chan,
>                         sirfport->rx_dma_items[sirfport->rx_completed].cookie, &tx_state)) {
>                 sirfsoc_uart_insert_rx_buf_to_tty(sirfport,
> --
> 1.9.0
>

[PATCH tty-next] serial: sirf: Fix compilation failure

[Greg Kroah-Hartman]

On Thu, May 29, 2014 at 08:14:02PM +0800, Barry Song wrote:
> 2014-05-29 18:13 GMT+08:00 Daniel Thompson <daniel.thompson@linaro.org>:
> > After 07d410e0) serial: sirf: fix spinlock deadlock issue it is no longer
> > possiblet to compile this driver. The rename of one of the spinlocks is
> > faulty. After looking at the original patch I believe this is the correct
> > fix.
> >
> > Compile tested using ARM's multi_v7_defconfig
> >
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Cc: Jiri Slaby <jslaby@suse.cz>
> > Cc: Barry Song <baohua@kernel.org>
> > Cc: Qipan Li <Qipan.Li@csr.com>
> > Cc: linux-serial at vger.kernel.org
> > Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
> 
> Qipan prepared a same patch to fix this.

Why didn't he send it?

[PATCH tty-next] serial: sirf: Fix compilation failure

[Barry Song]

2014-05-30 2:25 GMT+08:00 Greg Kroah-Hartman <gregkh@linuxfoundation.org>:
> On Thu, May 29, 2014 at 08:14:02PM +0800, Barry Song wrote:
>> 2014-05-29 18:13 GMT+08:00 Daniel Thompson <daniel.thompson@linaro.org>:
>> > After 07d410e0) serial: sirf: fix spinlock deadlock issue it is no longer
>> > possiblet to compile this driver. The rename of one of the spinlocks is
>> > faulty. After looking at the original patch I believe this is the correct
>> > fix.
>> >
>> > Compile tested using ARM's multi_v7_defconfig
>> >
>> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> > Cc: Jiri Slaby <jslaby@suse.cz>
>> > Cc: Barry Song <baohua@kernel.org>
>> > Cc: Qipan Li <Qipan.Li@csr.com>
>> > Cc: linux-serial at vger.kernel.org
>> > Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
>>
>> Qipan prepared a same patch to fix this.
>
> Why didn't he send it?

it is not that he didn't want to send, it is because Daniel has sent
the same patch earlier.

>

-barry