diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-03-03 06:05:00 -0500 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-03-04 07:32:04 -0500 |
| commit | e921eea8e7d4457f424bc3f821cb836e35b91f88 (patch) | |
| tree | c975a542b194d84d259e9cb1da3c820e9cc94ce0 /include/linux/dmaengine.h | |
| parent | ee655c2968a0d224484c91f07456d3a213463af6 (diff) | |
dmaengine: Remove memset leftovers
Commit 48a9db462d99 ("drivers/dma: remove unused support for MEMSET
operations") removed support for the memset operation in dmaengine, but left
the fill_aligned field that was supposed to set the buffer alignment for the
memset operations.
Remove that field too.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index b6997a0cb528..db0104b0da4d 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -574,7 +574,6 @@ struct dma_tx_state { | |||
| 574 | * @copy_align: alignment shift for memcpy operations | 574 | * @copy_align: alignment shift for memcpy operations |
| 575 | * @xor_align: alignment shift for xor operations | 575 | * @xor_align: alignment shift for xor operations |
| 576 | * @pq_align: alignment shift for pq operations | 576 | * @pq_align: alignment shift for pq operations |
| 577 | * @fill_align: alignment shift for memset operations | ||
| 578 | * @dev_id: unique device ID | 577 | * @dev_id: unique device ID |
| 579 | * @dev: struct device reference for dma mapping api | 578 | * @dev: struct device reference for dma mapping api |
| 580 | * @src_addr_widths: bit mask of src addr widths the device supports | 579 | * @src_addr_widths: bit mask of src addr widths the device supports |
| @@ -625,7 +624,6 @@ struct dma_device { | |||
| 625 | u8 copy_align; | 624 | u8 copy_align; |
| 626 | u8 xor_align; | 625 | u8 xor_align; |
| 627 | u8 pq_align; | 626 | u8 pq_align; |
| 628 | u8 fill_align; | ||
| 629 | #define DMA_HAS_PQ_CONTINUE (1 << 15) | 627 | #define DMA_HAS_PQ_CONTINUE (1 << 15) |
| 630 | 628 | ||
| 631 | int dev_id; | 629 | int dev_id; |
| @@ -826,12 +824,6 @@ static inline bool is_dma_pq_aligned(struct dma_device *dev, size_t off1, | |||
| 826 | return dmaengine_check_align(dev->pq_align, off1, off2, len); | 824 | return dmaengine_check_align(dev->pq_align, off1, off2, len); |
| 827 | } | 825 | } |
| 828 | 826 | ||
| 829 | static inline bool is_dma_fill_aligned(struct dma_device *dev, size_t off1, | ||
| 830 | size_t off2, size_t len) | ||
| 831 | { | ||
| 832 | return dmaengine_check_align(dev->fill_align, off1, off2, len); | ||
| 833 | } | ||
| 834 | |||
| 835 | static inline void | 827 | static inline void |
| 836 | dma_set_maxpq(struct dma_device *dma, int maxpq, int has_pq_continue) | 828 | dma_set_maxpq(struct dma_device *dma, int maxpq, int has_pq_continue) |
| 837 | { | 829 | { |
