dmaengine: add private header file

[deliverable/linux.git] / drivers / dma / mpc512x_dma.c

diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index 8ba4edc6185e904ea65b98537a1c09a2b38549bb..c56b3fe5d3fabdb433db6850f2dd8baa0ce078ce 100644 (file)
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -44,6 +44,8 @@
 
 #include <linux/random.h>
 
+#include "dmaengine.h"
+
 /* Number of DMA Transfer descriptors allocated per channel */
 #define MPC_DMA_DESCRIPTORS    64
 
@@ -188,7 +190,6 @@ struct mpc_dma_chan {
        struct list_head                completed;
        struct mpc_dma_tcd              *tcd;
        dma_addr_t                      tcd_paddr;
-       dma_cookie_t                    completed_cookie;
 
        /* Lock for this structure */
        spinlock_t                      lock;
@@ -365,7 +366,7 @@ static void mpc_dma_process_completed(struct mpc_dma *mdma)
                /* Free descriptors */
                spin_lock_irqsave(&mchan->lock, flags);
                list_splice_tail_init(&list, &mchan->free);
-               mchan->completed_cookie = last_cookie;
+               mchan->chan.completed_cookie = last_cookie;
                spin_unlock_irqrestore(&mchan->lock, flags);
        }
 }
@@ -568,7 +569,7 @@ mpc_dma_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
 
        spin_lock_irqsave(&mchan->lock, flags);
        last_used = mchan->chan.cookie;
-       last_complete = mchan->completed_cookie;
+       last_complete = mchan->chan.completed_cookie;
        spin_unlock_irqrestore(&mchan->lock, flags);
 
        dma_set_tx_state(txstate, last_complete, last_used, 0);
@@ -742,7 +743,7 @@ static int __devinit mpc_dma_probe(struct platform_device *op)
 
                mchan->chan.device = dma;
                mchan->chan.cookie = 1;
-               mchan->completed_cookie = mchan->chan.cookie;
+               mchan->chan.completed_cookie = mchan->chan.cookie;
 
                INIT_LIST_HEAD(&mchan->free);
                INIT_LIST_HEAD(&mchan->prepared);
@@ -835,17 +836,7 @@ static struct platform_driver mpc_dma_driver = {
        },
 };
 
-static int __init mpc_dma_init(void)
-{
-       return platform_driver_register(&mpc_dma_driver);
-}
-module_init(mpc_dma_init);
-
-static void __exit mpc_dma_exit(void)
-{
-       platform_driver_unregister(&mpc_dma_driver);
-}
-module_exit(mpc_dma_exit);
+module_platform_driver(mpc_dma_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Piotr Ziecik <kosmo@semihalf.com>");