diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-10-07 19:44:50 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-10-07 20:08:32 -0400 |
commit | 5fc6d897fde352bad5db5767e7260741a8cdd9e9 (patch) | |
tree | cb918dd33b8288aadead08b04b9f308f9d8bcbd1 /drivers/dma/dmaengine.c | |
parent | 400fb7f6a0cfe13025cb0296fdb4737da7025a8a (diff) |
async_tx: make async_tx channel switching opt-in
The majority of drivers in drivers/dma/ will never establish cross
channel operation chains and do not need the extra overhead in struct
dma_async_tx_descriptor. Make channel switching opt-in by default.
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Ira Snyder <iws@ovro.caltech.edu>
Cc: Linus Walleij <linus.walleij@stericsson.com>
Cc: Saeed Bishara <saeed@marvell.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/dmaengine.c')
-rw-r--r-- | drivers/dma/dmaengine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 235153cd7ac5..8bcb15fb959d 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
@@ -706,7 +706,7 @@ int dma_async_device_register(struct dma_device *device) | |||
706 | BUG_ON(!device->dev); | 706 | BUG_ON(!device->dev); |
707 | 707 | ||
708 | /* note: this only matters in the | 708 | /* note: this only matters in the |
709 | * CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y case | 709 | * CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=n case |
710 | */ | 710 | */ |
711 | if (device_has_all_tx_types(device)) | 711 | if (device_has_all_tx_types(device)) |
712 | dma_cap_set(DMA_ASYNC_TX, device->cap_mask); | 712 | dma_cap_set(DMA_ASYNC_TX, device->cap_mask); |
@@ -980,7 +980,7 @@ void dma_async_tx_descriptor_init(struct dma_async_tx_descriptor *tx, | |||
980 | struct dma_chan *chan) | 980 | struct dma_chan *chan) |
981 | { | 981 | { |
982 | tx->chan = chan; | 982 | tx->chan = chan; |
983 | #ifndef CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH | 983 | #ifdef CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH |
984 | spin_lock_init(&tx->lock); | 984 | spin_lock_init(&tx->lock); |
985 | #endif | 985 | #endif |
986 | } | 986 | } |