Merge branch 'topic/bam' into for-linus (535f2960) · Commits · jan.koester / Linux

drivers/dma/qcom/bam_dma.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -451,6 +451,7 @@ static void bam_reset_channel(struct bam_chan *bchan)
		/**
		* bam_chan_init_hw - Initialize channel hardware
		* @bchan: bam channel
		* @dir: DMA transfer direction
		*
		* This function resets and initializes the BAM channel
		*/
		@@ -665,7 +666,7 @@ static struct dma_async_tx_descriptor bam_prep_slave_sg(struct dma_chan chan,
		remainder = 0;
		}

		async_desc->length += desc->size;
		async_desc->length += le16_to_cpu(desc->size);
		desc++;
		} while (remainder > 0);
		}
		@@ -679,7 +680,7 @@ static struct dma_async_tx_descriptor bam_prep_slave_sg(struct dma_chan chan,

		/**
		* bam_dma_terminate_all - terminate all transactions on a channel
		* @bchan: bam dma channel
		* @chan: bam dma channel
		*
		* Dequeues and frees all transactions
		* No callbacks are done
		@@ -910,7 +911,8 @@ static enum dma_status bam_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
		continue;

		for (i = 0; i < async_desc->num_desc; i++)
		residue += async_desc->curr_desc[i].size;
		residue += le16_to_cpu(
		async_desc->curr_desc[i].size);
		}
		}

		@@ -950,7 +952,7 @@ static void bam_apply_new_config(struct bam_chan *bchan,

		/**
		* bam_start_dma - start next transaction
		* @bchan - bam dma channel
		* @bchan: bam dma channel
		*/
		static void bam_start_dma(struct bam_chan *bchan)
		{