diff options
| -rw-r--r-- | drivers/dma/dmaengine.c | 6 | ||||
| -rw-r--r-- | include/linux/dmaengine.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index d6dc70fd752..97b329e7679 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -42,9 +42,9 @@ | |||
| 42 | * | 42 | * |
| 43 | * Each device has a kref, which is initialized to 1 when the device is | 43 | * Each device has a kref, which is initialized to 1 when the device is |
| 44 | * registered. A kref_get is done for each device registered. When the | 44 | * registered. A kref_get is done for each device registered. When the |
| 45 | * device is released, the coresponding kref_put is done in the release | 45 | * device is released, the corresponding kref_put is done in the release |
| 46 | * method. Every time one of the device's channels is allocated to a client, | 46 | * method. Every time one of the device's channels is allocated to a client, |
| 47 | * a kref_get occurs. When the channel is freed, the coresponding kref_put | 47 | * a kref_get occurs. When the channel is freed, the corresponding kref_put |
| 48 | * happens. The device's release function does a completion, so | 48 | * happens. The device's release function does a completion, so |
| 49 | * unregister_device does a remove event, device_unregister, a kref_put | 49 | * unregister_device does a remove event, device_unregister, a kref_put |
| 50 | * for the first reference, then waits on the completion for all other | 50 | * for the first reference, then waits on the completion for all other |
| @@ -53,7 +53,7 @@ | |||
| 53 | * Each channel has an open-coded implementation of Rusty Russell's "bigref," | 53 | * Each channel has an open-coded implementation of Rusty Russell's "bigref," |
| 54 | * with a kref and a per_cpu local_t. A dma_chan_get is called when a client | 54 | * with a kref and a per_cpu local_t. A dma_chan_get is called when a client |
| 55 | * signals that it wants to use a channel, and dma_chan_put is called when | 55 | * signals that it wants to use a channel, and dma_chan_put is called when |
| 56 | * a channel is removed or a client using it is unregesitered. A client can | 56 | * a channel is removed or a client using it is unregistered. A client can |
| 57 | * take extra references per outstanding transaction, as is the case with | 57 | * take extra references per outstanding transaction, as is the case with |
| 58 | * the NET DMA client. The release function does a kref_put on the device. | 58 | * the NET DMA client. The release function does a kref_put on the device. |
| 59 | * -ChrisL, DanW | 59 | * -ChrisL, DanW |
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index b4d84ed6187..d08a5c5eb92 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -404,7 +404,7 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan, | |||
| 404 | * @last_used: last cookie value handed out | 404 | * @last_used: last cookie value handed out |
| 405 | * | 405 | * |
| 406 | * dma_async_is_complete() is used in dma_async_memcpy_complete() | 406 | * dma_async_is_complete() is used in dma_async_memcpy_complete() |
| 407 | * the test logic is seperated for lightweight testing of multiple cookies | 407 | * the test logic is separated for lightweight testing of multiple cookies |
| 408 | */ | 408 | */ |
| 409 | static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, | 409 | static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, |
| 410 | dma_cookie_t last_complete, dma_cookie_t last_used) | 410 | dma_cookie_t last_complete, dma_cookie_t last_used) |