diff options
Diffstat (limited to 'drivers/dma/ioatdma.h')
-rw-r--r-- | drivers/dma/ioatdma.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h index 62b26a9be4c9..d3726478031a 100644 --- a/drivers/dma/ioatdma.h +++ b/drivers/dma/ioatdma.h | |||
@@ -30,9 +30,6 @@ | |||
30 | 30 | ||
31 | #define IOAT_LOW_COMPLETION_MASK 0xffffffc0 | 31 | #define IOAT_LOW_COMPLETION_MASK 0xffffffc0 |
32 | 32 | ||
33 | extern struct list_head dma_device_list; | ||
34 | extern struct list_head dma_client_list; | ||
35 | |||
36 | /** | 33 | /** |
37 | * struct ioat_device - internal representation of a IOAT device | 34 | * struct ioat_device - internal representation of a IOAT device |
38 | * @pdev: PCI-Express device | 35 | * @pdev: PCI-Express device |
@@ -105,21 +102,20 @@ struct ioat_dma_chan { | |||
105 | /** | 102 | /** |
106 | * struct ioat_desc_sw - wrapper around hardware descriptor | 103 | * struct ioat_desc_sw - wrapper around hardware descriptor |
107 | * @hw: hardware DMA descriptor | 104 | * @hw: hardware DMA descriptor |
108 | * @node: | 105 | * @node: this descriptor will either be on the free list, |
109 | * @cookie: | 106 | * or attached to a transaction list (async_tx.tx_list) |
110 | * @phys: | 107 | * @tx_cnt: number of descriptors required to complete the transaction |
108 | * @async_tx: the generic software descriptor for all engines | ||
111 | */ | 109 | */ |
112 | |||
113 | struct ioat_desc_sw { | 110 | struct ioat_desc_sw { |
114 | struct ioat_dma_descriptor *hw; | 111 | struct ioat_dma_descriptor *hw; |
115 | struct list_head node; | 112 | struct list_head node; |
116 | dma_cookie_t cookie; | 113 | int tx_cnt; |
117 | dma_addr_t phys; | ||
118 | DECLARE_PCI_UNMAP_ADDR(src) | 114 | DECLARE_PCI_UNMAP_ADDR(src) |
119 | DECLARE_PCI_UNMAP_LEN(src_len) | 115 | DECLARE_PCI_UNMAP_LEN(src_len) |
120 | DECLARE_PCI_UNMAP_ADDR(dst) | 116 | DECLARE_PCI_UNMAP_ADDR(dst) |
121 | DECLARE_PCI_UNMAP_LEN(dst_len) | 117 | DECLARE_PCI_UNMAP_LEN(dst_len) |
118 | struct dma_async_tx_descriptor async_tx; | ||
122 | }; | 119 | }; |
123 | 120 | ||
124 | #endif /* IOATDMA_H */ | 121 | #endif /* IOATDMA_H */ |
125 | |||