diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-01-06 13:38:16 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-01-06 13:38:16 -0500 |
commit | 74465b4ff9ac1da503025c0a0042e023bfa6505c (patch) | |
tree | ce63f4a4b055b65cae1edaddd334931bf512c76e /drivers/dma/dmaengine.c | |
parent | 33df8ca068123457db56c316946a3c0e4ef787d6 (diff) |
atmel-mci: convert to dma_request_channel and down-level dma_slave
dma_request_channel provides an exclusive channel, so we no longer need to
pass slave data through dmaengine.
Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/dmaengine.c')
-rw-r--r-- | drivers/dma/dmaengine.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 7a0594f24a3f..90aca505a1df 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
@@ -234,10 +234,6 @@ static void dma_client_chan_alloc(struct dma_client *client) | |||
234 | list_for_each_entry(device, &dma_device_list, global_node) { | 234 | list_for_each_entry(device, &dma_device_list, global_node) { |
235 | if (dma_has_cap(DMA_PRIVATE, device->cap_mask)) | 235 | if (dma_has_cap(DMA_PRIVATE, device->cap_mask)) |
236 | continue; | 236 | continue; |
237 | /* Does the client require a specific DMA controller? */ | ||
238 | if (client->slave && client->slave->dma_dev | ||
239 | && client->slave->dma_dev != device->dev) | ||
240 | continue; | ||
241 | if (!dma_device_satisfies_mask(device, client->cap_mask)) | 237 | if (!dma_device_satisfies_mask(device, client->cap_mask)) |
242 | continue; | 238 | continue; |
243 | 239 | ||
@@ -613,10 +609,6 @@ void dma_async_client_register(struct dma_client *client) | |||
613 | struct dma_chan *chan; | 609 | struct dma_chan *chan; |
614 | int err; | 610 | int err; |
615 | 611 | ||
616 | /* validate client data */ | ||
617 | BUG_ON(dma_has_cap(DMA_SLAVE, client->cap_mask) && | ||
618 | !client->slave); | ||
619 | |||
620 | mutex_lock(&dma_list_mutex); | 612 | mutex_lock(&dma_list_mutex); |
621 | dmaengine_ref_count++; | 613 | dmaengine_ref_count++; |
622 | 614 | ||