diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-07-28 17:33:42 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:29:54 -0400 |
commit | bc3c70258526a635325f1f15138a96297879bc1a (patch) | |
tree | 65ced583f975cb19dc12f498f7e97536033fe74f /drivers/dma/ioat/dma.h | |
parent | e6c0b69a43150c1a37cf342ce5faedf12583bf79 (diff) |
ioat: cleanup some long deref chains and 80 column collisions
* reduce device->common. to dma-> in ioat_dma_{probe,remove,selftest}
* ioat_lookup_chan_by_index to ioat_chan_by_index
* multi-line function definitions
* ioat_desc_sw.async_tx to ioat_desc_sw.txd
* desc->txd. to tx-> in cleanup routine
Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ioat/dma.h')
-rw-r--r-- | drivers/dma/ioat/dma.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h index 5e8d7cfabc21..c5eabae4c1b9 100644 --- a/drivers/dma/ioat/dma.h +++ b/drivers/dma/ioat/dma.h | |||
@@ -38,7 +38,8 @@ | |||
38 | #define to_ioat_chan(chan) container_of(chan, struct ioat_dma_chan, common) | 38 | #define to_ioat_chan(chan) container_of(chan, struct ioat_dma_chan, common) |
39 | #define to_ioatdma_device(dev) container_of(dev, struct ioatdma_device, common) | 39 | #define to_ioatdma_device(dev) container_of(dev, struct ioatdma_device, common) |
40 | #define to_ioat_desc(lh) container_of(lh, struct ioat_desc_sw, node) | 40 | #define to_ioat_desc(lh) container_of(lh, struct ioat_desc_sw, node) |
41 | #define tx_to_ioat_desc(tx) container_of(tx, struct ioat_desc_sw, async_tx) | 41 | #define tx_to_ioat_desc(tx) container_of(tx, struct ioat_desc_sw, txd) |
42 | #define to_dev(ioat_chan) (&(ioat_chan)->device->pdev->dev) | ||
42 | 43 | ||
43 | #define chan_num(ch) ((int)((ch)->reg_base - (ch)->device->reg_base) / 0x80) | 44 | #define chan_num(ch) ((int)((ch)->reg_base - (ch)->device->reg_base) / 0x80) |
44 | 45 | ||
@@ -123,7 +124,7 @@ struct ioat_dma_chan { | |||
123 | * @node: this descriptor will either be on the free list, | 124 | * @node: this descriptor will either be on the free list, |
124 | * or attached to a transaction list (async_tx.tx_list) | 125 | * or attached to a transaction list (async_tx.tx_list) |
125 | * @tx_cnt: number of descriptors required to complete the transaction | 126 | * @tx_cnt: number of descriptors required to complete the transaction |
126 | * @async_tx: the generic software descriptor for all engines | 127 | * @txd: the generic software descriptor for all engines |
127 | */ | 128 | */ |
128 | struct ioat_desc_sw { | 129 | struct ioat_desc_sw { |
129 | struct ioat_dma_descriptor *hw; | 130 | struct ioat_dma_descriptor *hw; |
@@ -132,7 +133,7 @@ struct ioat_desc_sw { | |||
132 | size_t len; | 133 | size_t len; |
133 | dma_addr_t src; | 134 | dma_addr_t src; |
134 | dma_addr_t dst; | 135 | dma_addr_t dst; |
135 | struct dma_async_tx_descriptor async_tx; | 136 | struct dma_async_tx_descriptor txd; |
136 | }; | 137 | }; |
137 | 138 | ||
138 | static inline void ioat_set_tcp_copy_break(struct ioatdma_device *dev) | 139 | static inline void ioat_set_tcp_copy_break(struct ioatdma_device *dev) |