]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: xillybus: Remove mmiowb() before wait_event_*() calls
authorEli Billauer <eli.billauer@gmail.com>
Sat, 16 Aug 2014 15:57:56 +0000 (18:57 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 30 Aug 2014 20:14:41 +0000 (13:14 -0700)
According to Documentation/memory-barriers.txt, a memory barrier is put
in place by wait_event_*()

Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xillybus/xillybus_core.c

index 0214009f7513a5ad98e450049bc76396e006efd8..93a3c61b1cd5a1b8fd9594d8bd38612c05e71692 100644 (file)
@@ -640,7 +640,6 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint)
        iowrite32(1 |
                   (3 << 24), /* Opcode 3 for channel 0 = Send IDT */
                   endpoint->registers + fpga_buf_ctrl_reg);
-       mmiowb(); /* Just to appear safe */
 
        wait_event_interruptible_timeout(channel->wr_wait,
                                         (!channel->wr_sleepy),
@@ -1986,7 +1985,6 @@ static int xilly_quiesce(struct xilly_endpoint *endpoint)
        wmb(); /* Make sure idtlen is set before sending command */
        iowrite32((u32) (endpoint->dma_using_dac & 0x0001),
                  endpoint->registers + fpga_dma_control_reg);
-       mmiowb();
 
        wait_event_interruptible_timeout(endpoint->ep_wait,
                                         (endpoint->idtlen >= 0),
@@ -2055,7 +2053,6 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint)
         */
        iowrite32((u32) (endpoint->dma_using_dac & 0x0001),
                   endpoint->registers + fpga_dma_control_reg);
-       mmiowb();
 
        wait_event_interruptible_timeout(endpoint->ep_wait,
                                         (endpoint->idtlen >= 0),