dmaengine: Remove the context argument to the prep_dma_cyclic operation
The argument is always set to NULL and never used. Remove it. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
parent
f02323ec68
commit
31c1e5a135
|
@ -1653,7 +1653,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
|
||||||
static struct dma_async_tx_descriptor *pl08x_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *pl08x_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
|
struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
|
||||||
struct pl08x_driver_data *pl08x = plchan->host;
|
struct pl08x_driver_data *pl08x = plchan->host;
|
||||||
|
|
|
@ -893,12 +893,11 @@ atc_dma_cyclic_fill_desc(struct dma_chan *chan, struct at_desc *desc,
|
||||||
* @period_len: number of bytes for each period
|
* @period_len: number of bytes for each period
|
||||||
* @direction: transfer direction, to or from device
|
* @direction: transfer direction, to or from device
|
||||||
* @flags: tx descriptor status flags
|
* @flags: tx descriptor status flags
|
||||||
* @context: transfer context (ignored)
|
|
||||||
*/
|
*/
|
||||||
static struct dma_async_tx_descriptor *
|
static struct dma_async_tx_descriptor *
|
||||||
atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct at_dma_chan *atchan = to_at_dma_chan(chan);
|
struct at_dma_chan *atchan = to_at_dma_chan(chan);
|
||||||
struct at_dma_slave *atslave = chan->private;
|
struct at_dma_slave *atslave = chan->private;
|
||||||
|
|
|
@ -335,7 +335,7 @@ static void bcm2835_dma_issue_pending(struct dma_chan *chan)
|
||||||
static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
|
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
|
||||||
enum dma_slave_buswidth dev_width;
|
enum dma_slave_buswidth dev_width;
|
||||||
|
|
|
@ -433,7 +433,7 @@ static struct dma_async_tx_descriptor *jz4740_dma_prep_slave_sg(
|
||||||
static struct dma_async_tx_descriptor *jz4740_dma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *jz4740_dma_prep_dma_cyclic(
|
||||||
struct dma_chan *c, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *c, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct jz4740_dmaengine_chan *chan = to_jz4740_dma_chan(c);
|
struct jz4740_dmaengine_chan *chan = to_jz4740_dma_chan(c);
|
||||||
struct jz4740_dma_desc *desc;
|
struct jz4740_dma_desc *desc;
|
||||||
|
|
|
@ -598,7 +598,7 @@ struct dma_async_tx_descriptor *edma_prep_dma_memcpy(
|
||||||
static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long tx_flags, void *context)
|
unsigned long tx_flags)
|
||||||
{
|
{
|
||||||
struct edma_chan *echan = to_edma_chan(chan);
|
struct edma_chan *echan = to_edma_chan(chan);
|
||||||
struct device *dev = chan->device->dev;
|
struct device *dev = chan->device->dev;
|
||||||
|
|
|
@ -1092,7 +1092,6 @@ fail:
|
||||||
* @period_len: length of a single period
|
* @period_len: length of a single period
|
||||||
* @dir: direction of the operation
|
* @dir: direction of the operation
|
||||||
* @flags: tx descriptor status flags
|
* @flags: tx descriptor status flags
|
||||||
* @context: operation context (ignored)
|
|
||||||
*
|
*
|
||||||
* Prepares a descriptor for cyclic DMA operation. This means that once the
|
* Prepares a descriptor for cyclic DMA operation. This means that once the
|
||||||
* descriptor is submitted, we will be submitting in a @period_len sized
|
* descriptor is submitted, we will be submitting in a @period_len sized
|
||||||
|
@ -1105,8 +1104,7 @@ fail:
|
||||||
static struct dma_async_tx_descriptor *
|
static struct dma_async_tx_descriptor *
|
||||||
ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
|
ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
|
||||||
size_t buf_len, size_t period_len,
|
size_t buf_len, size_t period_len,
|
||||||
enum dma_transfer_direction dir, unsigned long flags,
|
enum dma_transfer_direction dir, unsigned long flags)
|
||||||
void *context)
|
|
||||||
{
|
{
|
||||||
struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);
|
struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);
|
||||||
struct ep93xx_dma_desc *desc, *first;
|
struct ep93xx_dma_desc *desc, *first;
|
||||||
|
|
|
@ -517,7 +517,7 @@ err:
|
||||||
static struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
|
struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
|
||||||
struct fsl_edma_desc *fsl_desc;
|
struct fsl_edma_desc *fsl_desc;
|
||||||
|
|
|
@ -866,7 +866,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_slave_sg(
|
||||||
static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *imxdma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct imxdma_channel *imxdmac = to_imxdma_chan(chan);
|
struct imxdma_channel *imxdmac = to_imxdma_chan(chan);
|
||||||
struct imxdma_engine *imxdma = imxdmac->imxdma;
|
struct imxdma_engine *imxdma = imxdmac->imxdma;
|
||||||
|
|
|
@ -1125,7 +1125,7 @@ err_out:
|
||||||
static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct sdma_channel *sdmac = to_sdma_chan(chan);
|
struct sdma_channel *sdmac = to_sdma_chan(chan);
|
||||||
struct sdma_engine *sdma = sdmac->sdma;
|
struct sdma_engine *sdma = sdmac->sdma;
|
||||||
|
|
|
@ -601,7 +601,7 @@ static struct dma_async_tx_descriptor *
|
||||||
mmp_pdma_prep_dma_cyclic(struct dma_chan *dchan,
|
mmp_pdma_prep_dma_cyclic(struct dma_chan *dchan,
|
||||||
dma_addr_t buf_addr, size_t len, size_t period_len,
|
dma_addr_t buf_addr, size_t len, size_t period_len,
|
||||||
enum dma_transfer_direction direction,
|
enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct mmp_pdma_chan *chan;
|
struct mmp_pdma_chan *chan;
|
||||||
struct mmp_pdma_desc_sw *first = NULL, *prev = NULL, *new;
|
struct mmp_pdma_desc_sw *first = NULL, *prev = NULL, *new;
|
||||||
|
|
|
@ -389,7 +389,7 @@ struct mmp_tdma_desc *mmp_tdma_alloc_descriptor(struct mmp_tdma_chan *tdmac)
|
||||||
static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
|
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
|
||||||
struct mmp_tdma_desc *desc;
|
struct mmp_tdma_desc *desc;
|
||||||
|
|
|
@ -589,7 +589,7 @@ err_out:
|
||||||
static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
|
struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
|
||||||
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
|
struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma;
|
||||||
|
|
|
@ -853,8 +853,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg(
|
||||||
|
|
||||||
static struct dma_async_tx_descriptor *omap_dma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *omap_dma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction dir, unsigned long flags,
|
size_t period_len, enum dma_transfer_direction dir, unsigned long flags)
|
||||||
void *context)
|
|
||||||
{
|
{
|
||||||
struct omap_dmadev *od = to_omap_dma_dev(chan->device);
|
struct omap_dmadev *od = to_omap_dma_dev(chan->device);
|
||||||
struct omap_chan *c = to_omap_dma_chan(chan);
|
struct omap_chan *c = to_omap_dma_chan(chan);
|
||||||
|
|
|
@ -2362,7 +2362,7 @@ static inline int get_burst_len(struct dma_pl330_desc *desc, size_t len)
|
||||||
static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t dma_addr, size_t len,
|
struct dma_chan *chan, dma_addr_t dma_addr, size_t len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct dma_pl330_desc *desc = NULL, *first = NULL;
|
struct dma_pl330_desc *desc = NULL, *first = NULL;
|
||||||
struct dma_pl330_chan *pch = to_pchan(chan);
|
struct dma_pl330_chan *pch = to_pchan(chan);
|
||||||
|
|
|
@ -889,8 +889,7 @@ static struct dma_async_tx_descriptor *s3c24xx_dma_prep_memcpy(
|
||||||
|
|
||||||
static struct dma_async_tx_descriptor *s3c24xx_dma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *s3c24xx_dma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t addr, size_t size, size_t period,
|
struct dma_chan *chan, dma_addr_t addr, size_t size, size_t period,
|
||||||
enum dma_transfer_direction direction, unsigned long flags,
|
enum dma_transfer_direction direction, unsigned long flags)
|
||||||
void *context)
|
|
||||||
{
|
{
|
||||||
struct s3c24xx_dma_chan *s3cchan = to_s3c24xx_dma_chan(chan);
|
struct s3c24xx_dma_chan *s3cchan = to_s3c24xx_dma_chan(chan);
|
||||||
struct s3c24xx_dma_engine *s3cdma = s3cchan->host;
|
struct s3c24xx_dma_engine *s3cdma = s3cchan->host;
|
||||||
|
|
|
@ -612,7 +612,7 @@ static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg(
|
||||||
|
|
||||||
static struct dma_async_tx_descriptor *sa11x0_dma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *sa11x0_dma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t addr, size_t size, size_t period,
|
struct dma_chan *chan, dma_addr_t addr, size_t size, size_t period,
|
||||||
enum dma_transfer_direction dir, unsigned long flags, void *context)
|
enum dma_transfer_direction dir, unsigned long flags)
|
||||||
{
|
{
|
||||||
struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
|
struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
|
||||||
struct sa11x0_dma_desc *txd;
|
struct sa11x0_dma_desc *txd;
|
||||||
|
|
|
@ -668,7 +668,7 @@ static struct dma_async_tx_descriptor *shdma_prep_slave_sg(
|
||||||
static struct dma_async_tx_descriptor *shdma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *shdma_prep_dma_cyclic(
|
||||||
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct shdma_chan *schan = to_shdma_chan(chan);
|
struct shdma_chan *schan = to_shdma_chan(chan);
|
||||||
struct shdma_dev *sdev = to_shdma_dev(schan->dma_chan.device);
|
struct shdma_dev *sdev = to_shdma_dev(schan->dma_chan.device);
|
||||||
|
|
|
@ -580,7 +580,7 @@ err_dir:
|
||||||
static struct dma_async_tx_descriptor *
|
static struct dma_async_tx_descriptor *
|
||||||
sirfsoc_dma_prep_cyclic(struct dma_chan *chan, dma_addr_t addr,
|
sirfsoc_dma_prep_cyclic(struct dma_chan *chan, dma_addr_t addr,
|
||||||
size_t buf_len, size_t period_len,
|
size_t buf_len, size_t period_len,
|
||||||
enum dma_transfer_direction direction, unsigned long flags, void *context)
|
enum dma_transfer_direction direction, unsigned long flags)
|
||||||
{
|
{
|
||||||
struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);
|
struct sirfsoc_dma_chan *schan = dma_chan_to_sirfsoc_dma_chan(chan);
|
||||||
struct sirfsoc_dma_desc *sdesc = NULL;
|
struct sirfsoc_dma_desc *sdesc = NULL;
|
||||||
|
|
|
@ -2531,8 +2531,7 @@ d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
|
||||||
static struct dma_async_tx_descriptor *
|
static struct dma_async_tx_descriptor *
|
||||||
dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
|
dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
|
||||||
size_t buf_len, size_t period_len,
|
size_t buf_len, size_t period_len,
|
||||||
enum dma_transfer_direction direction, unsigned long flags,
|
enum dma_transfer_direction direction, unsigned long flags)
|
||||||
void *context)
|
|
||||||
{
|
{
|
||||||
unsigned int periods = buf_len / period_len;
|
unsigned int periods = buf_len / period_len;
|
||||||
struct dma_async_tx_descriptor *txd;
|
struct dma_async_tx_descriptor *txd;
|
||||||
|
|
|
@ -1055,7 +1055,7 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg(
|
||||||
static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic(
|
static struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic(
|
||||||
struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
|
struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
|
||||||
struct tegra_dma_desc *dma_desc = NULL;
|
struct tegra_dma_desc *dma_desc = NULL;
|
||||||
|
|
|
@ -669,7 +669,7 @@ struct dma_device {
|
||||||
struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)(
|
struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)(
|
||||||
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
|
||||||
size_t period_len, enum dma_transfer_direction direction,
|
size_t period_len, enum dma_transfer_direction direction,
|
||||||
unsigned long flags, void *context);
|
unsigned long flags);
|
||||||
struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
|
struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)(
|
||||||
struct dma_chan *chan, struct dma_interleaved_template *xt,
|
struct dma_chan *chan, struct dma_interleaved_template *xt,
|
||||||
unsigned long flags);
|
unsigned long flags);
|
||||||
|
@ -744,7 +744,7 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic(
|
||||||
unsigned long flags)
|
unsigned long flags)
|
||||||
{
|
{
|
||||||
return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len,
|
return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len,
|
||||||
period_len, dir, flags, NULL);
|
period_len, dir, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline struct dma_async_tx_descriptor *dmaengine_prep_interleaved_dma(
|
static inline struct dma_async_tx_descriptor *dmaengine_prep_interleaved_dma(
|
||||||
|
|
Loading…
Reference in New Issue