staging: xillybus: Removed write memory barriers before wait_event_*()
authorEli Billauer <eli.billauer@gmail.com>
Sat, 16 Aug 2014 15:57:59 +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 bee58a2db310de71c653f104b72a9b27dc4af57e..f48e4de0ca3a625f31b3d858b39559a2c9615808 100644 (file)
@@ -634,7 +634,6 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint)
        channel = endpoint->channels[1]; /* This should be generated ad-hoc */
 
        channel->wr_sleepy = 1;
-       wmb(); /* Setting wr_sleepy must come before the command */
 
        iowrite32(1 |
                   (3 << 24), /* Opcode 3 for channel 0 = Send IDT */
@@ -1968,7 +1967,7 @@ EXPORT_SYMBOL(xillybus_init_endpoint);
 static int xilly_quiesce(struct xilly_endpoint *endpoint)
 {
        endpoint->idtlen = -1;
-       wmb(); /* Make sure idtlen is set before sending command */
+
        iowrite32((u32) (endpoint->dma_using_dac & 0x0001),
                  endpoint->registers + fpga_dma_control_reg);
 
@@ -2029,8 +2028,6 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint)
 
        endpoint->idtlen = -1;
 
-       smp_wmb();
-
        /*
         * Set DMA 32/64 bit mode, quiesce the device (?!) and get IDT
         * buffer size.