diff options
Diffstat (limited to 'include/linux/dmaengine.h')
-rw-r--r-- | include/linux/dmaengine.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index b6997a0cb528..ad419757241f 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -11,10 +11,6 @@ | |||
11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
12 | * more details. | 12 | * more details. |
13 | * | 13 | * |
14 | * You should have received a copy of the GNU General Public License along with | ||
15 | * this program; if not, write to the Free Software Foundation, Inc., 59 | ||
16 | * Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
17 | * | ||
18 | * The full GNU General Public License is included in this distribution in the | 14 | * The full GNU General Public License is included in this distribution in the |
19 | * file called COPYING. | 15 | * file called COPYING. |
20 | */ | 16 | */ |
@@ -574,7 +570,6 @@ struct dma_tx_state { | |||
574 | * @copy_align: alignment shift for memcpy operations | 570 | * @copy_align: alignment shift for memcpy operations |
575 | * @xor_align: alignment shift for xor operations | 571 | * @xor_align: alignment shift for xor operations |
576 | * @pq_align: alignment shift for pq operations | 572 | * @pq_align: alignment shift for pq operations |
577 | * @fill_align: alignment shift for memset operations | ||
578 | * @dev_id: unique device ID | 573 | * @dev_id: unique device ID |
579 | * @dev: struct device reference for dma mapping api | 574 | * @dev: struct device reference for dma mapping api |
580 | * @src_addr_widths: bit mask of src addr widths the device supports | 575 | * @src_addr_widths: bit mask of src addr widths the device supports |
@@ -625,7 +620,6 @@ struct dma_device { | |||
625 | u8 copy_align; | 620 | u8 copy_align; |
626 | u8 xor_align; | 621 | u8 xor_align; |
627 | u8 pq_align; | 622 | u8 pq_align; |
628 | u8 fill_align; | ||
629 | #define DMA_HAS_PQ_CONTINUE (1 << 15) | 623 | #define DMA_HAS_PQ_CONTINUE (1 << 15) |
630 | 624 | ||
631 | int dev_id; | 625 | int dev_id; |
@@ -826,12 +820,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); | 820 | return dmaengine_check_align(dev->pq_align, off1, off2, len); |
827 | } | 821 | } |
828 | 822 | ||
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 | 823 | static inline void |
836 | dma_set_maxpq(struct dma_device *dma, int maxpq, int has_pq_continue) | 824 | dma_set_maxpq(struct dma_device *dma, int maxpq, int has_pq_continue) |
837 | { | 825 | { |
@@ -1098,7 +1086,6 @@ void dma_async_device_unregister(struct dma_device *device); | |||
1098 | void dma_run_dependencies(struct dma_async_tx_descriptor *tx); | 1086 | void dma_run_dependencies(struct dma_async_tx_descriptor *tx); |
1099 | struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); | 1087 | struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); |
1100 | struct dma_chan *dma_get_any_slave_channel(struct dma_device *device); | 1088 | struct dma_chan *dma_get_any_slave_channel(struct dma_device *device); |
1101 | struct dma_chan *net_dma_find_channel(void); | ||
1102 | #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) | 1089 | #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) |
1103 | #define dma_request_slave_channel_compat(mask, x, y, dev, name) \ | 1090 | #define dma_request_slave_channel_compat(mask, x, y, dev, name) \ |
1104 | __dma_request_slave_channel_compat(&(mask), x, y, dev, name) | 1091 | __dma_request_slave_channel_compat(&(mask), x, y, dev, name) |
@@ -1116,27 +1103,4 @@ static inline struct dma_chan | |||
1116 | 1103 | ||
1117 | return __dma_request_channel(mask, fn, fn_param); | 1104 | return __dma_request_channel(mask, fn, fn_param); |
1118 | } | 1105 | } |
1119 | |||
1120 | /* --- Helper iov-locking functions --- */ | ||
1121 | |||
1122 | struct dma_page_list { | ||
1123 | char __user *base_address; | ||
1124 | int nr_pages; | ||
1125 | struct page **pages; | ||
1126 | }; | ||
1127 | |||
1128 | struct dma_pinned_list { | ||
1129 | int nr_iovecs; | ||
1130 | struct dma_page_list page_list[0]; | ||
1131 | }; | ||
1132 | |||
1133 | struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len); | ||
1134 | void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list); | ||
1135 | |||
1136 | dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov, | ||
1137 | struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len); | ||
1138 | dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov, | ||
1139 | struct dma_pinned_list *pinned_list, struct page *page, | ||
1140 | unsigned int offset, size_t len); | ||
1141 | |||
1142 | #endif /* DMAENGINE_H */ | 1106 | #endif /* DMAENGINE_H */ |