dmaengine: PL08x: remove circular_buffer boolean from channel data
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 26 May 2012 15:58:15 +0000 (16:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 1 Jul 2012 13:15:37 +0000 (14:15 +0100)
Circular buffers are not handled in this way; we have a separate API
call now to setup circular buffers.  So lets not mislead people with
this bool.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/dma/amba-pl08x.c
include/linux/amba/pl08x.h

index 9c5bae6..5821125 100644 (file)
@@ -1701,13 +1701,6 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x,
                                return -ENOMEM;
                        }
                }
-               if (chan->cd->circular_buffer) {
-                       dev_err(&pl08x->adev->dev,
-                               "channel %s: circular buffers not supported\n",
-                               chan->name);
-                       kfree(chan);
-                       continue;
-               }
                dev_dbg(&pl08x->adev->dev,
                         "initialize virtual channel \"%s\"\n",
                         chan->name);
index 0254901..0f5b34d 100644 (file)
@@ -51,9 +51,6 @@ enum {
  * can be the address of a FIFO register for burst requests for example.
  * This can be left undefined if the PrimeCell API is used for configuring
  * this.
- * @circular_buffer: whether the buffer passed in is circular and
- * shall simply be looped round round (like a record baby round
- * round round round)
  * @single: the device connected to this channel will request single DMA
  * transfers, not bursts. (Bursts are default.)
  * @periph_buses: the device connected to this channel is accessible via
@@ -66,7 +63,6 @@ struct pl08x_channel_data {
        u32 muxval;
        u32 cctl;
        dma_addr_t addr;
-       bool circular_buffer;
        bool single;
        u8 periph_buses;
 };