Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48afb311 authored by Russell King's avatar Russell King
Browse files

dmaengine: PL08x: remove circular_buffer boolean from channel data 



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: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c15a6ef6

drivers/dma/amba-pl08x.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -1701,13 +1701,6 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x, 
				return -ENOMEM;

				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,

		dev_dbg(&pl08x->adev->dev,

			 "initialize virtual channel \"%s\"\n",

			 "initialize virtual channel \"%s\"\n",

			 chan->name);

			 chan->name);

include/linux/amba/pl08x.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -51,9 +51,6 @@ enum { 
 * can be the address of a FIFO register for burst requests for example.

 * 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 can be left undefined if the PrimeCell API is used for configuring

 * this.

 * 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

 * @single: the device connected to this channel will request single DMA

 * transfers, not bursts. (Bursts are default.)

 * transfers, not bursts. (Bursts are default.)

 * @periph_buses: the device connected to this channel is accessible via

 * @periph_buses: the device connected to this channel is accessible via
@@ -66,7 +63,6 @@ struct pl08x_channel_data { 
	u32 muxval;

	u32 muxval;

	u32 cctl;

	u32 cctl;

	dma_addr_t addr;

	dma_addr_t addr;

	bool circular_buffer;

	bool single;

	bool single;

	u8 periph_buses;

	u8 periph_buses;

};

};