9 files changed, 20 insertions, 34 deletions

diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 802b55795f8b..836095ab3c5c 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -1,9 +1,5 @@
-ifeq ($(CONFIG_DMADEVICES_DEBUG),y)
-        ccflags-y       += -DDEBUG
-endif
-ifeq ($(CONFIG_DMADEVICES_VDEBUG),y)
-        ccflags-y       += -DVERBOSE_DEBUG
-endif
+ccflags-$(CONFIG_DMADEVICES_DEBUG)  := -DDEBUG
+ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
 
 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
 obj-$(CONFIG_NET_DMA) += iovlock.o
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 07bca4970e50..e6d7228b1479 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1845,7 +1845,7 @@ static inline void init_pl08x_debugfs(struct pl08x_driver_data *pl08x)
 }
 #endif
 
-static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
+static int pl08x_probe(struct amba_device *adev, const struct amba_id *id)
 {
         struct pl08x_driver_data *pl08x;
         const struct vendor_data *vd = id->data;
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index a6656834f0ff..00deabd9a04b 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -849,7 +849,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
 
                                 /* Must clear TC interrupt before calling
                                  * dma_tc_handle
-                                 * in case tc_handle initate a new dma job
+                                 * in case tc_handle initiate a new dma job
                                  */
                                 __set_bit(i, virtbase + COH901318_TC_INT_CLEAR1);
 
@@ -894,7 +894,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
                                 }
                                 /* Must clear TC interrupt before calling
                                  * dma_tc_handle
-                                 * in case tc_handle initate a new dma job
+                                 * in case tc_handle initiate a new dma job
                                  */
                                 __set_bit(i, virtbase + COH901318_TC_INT_CLEAR2);
 
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 8670a5012122..6b396759e7f5 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1332,8 +1332,7 @@ static void fsl_dma_chan_remove(struct fsldma_chan *chan)
         kfree(chan);
 }
 
-static int __devinit fsldma_of_probe(struct platform_device *op,
-                        const struct of_device_id *match)
+static int __devinit fsldma_of_probe(struct platform_device *op)
 {
         struct fsldma_device *fdev;
         struct device_node *child;
@@ -1465,20 +1464,13 @@ static struct of_platform_driver fsldma_of_driver = {
 
 static __init int fsldma_init(void)
 {
-        int ret;
-
         pr_info("Freescale Elo / Elo Plus DMA driver\n");
-
-        ret = of_register_platform_driver(&fsldma_of_driver);
-        if (ret)
-                pr_err("fsldma: failed to register platform driver\n");
-
-        return ret;
+        return platform_driver_register(&fsldma_of_driver);
 }
 
 static void __exit fsldma_exit(void)
 {
-        of_unregister_platform_driver(&fsldma_of_driver);
+        platform_driver_unregister(&fsldma_of_driver);
 }
 
 subsys_initcall(fsldma_init);
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index 59c270192ccc..4f95d31f5a20 100644
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -649,8 +649,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src,
         return &mdesc->desc;
 }
 
-static int __devinit mpc_dma_probe(struct platform_device *op,
-                                        const struct of_device_id *match)
+static int __devinit mpc_dma_probe(struct platform_device *op)
 {
         struct device_node *dn = op->dev.of_node;
         struct device *dev = &op->dev;
@@ -827,7 +826,7 @@ static struct of_device_id mpc_dma_match[] = {
         {},
 };
 
-static struct of_platform_driver mpc_dma_driver = {
+static struct platform_driver mpc_dma_driver = {
         .probe          = mpc_dma_probe,
         .remove         = __devexit_p(mpc_dma_remove),
         .driver = {
@@ -839,13 +838,13 @@ static struct of_platform_driver mpc_dma_driver = {
 
 static int __init mpc_dma_init(void)
 {
-        return of_register_platform_driver(&mpc_dma_driver);
+        return platform_driver_register(&mpc_dma_driver);
 }
 module_init(mpc_dma_init);
 
 static void __exit mpc_dma_exit(void)
 {
-        of_unregister_platform_driver(&mpc_dma_driver);
+        platform_driver_unregister(&mpc_dma_driver);
 }
 module_exit(mpc_dma_exit);
 
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 7c50f6dfd3f4..6abe1ec1f2ce 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -657,7 +657,7 @@ static irqreturn_t pl330_irq_handler(int irq, void *data)
 }
 
 static int __devinit
-pl330_probe(struct amba_device *adev, struct amba_id *id)
+pl330_probe(struct amba_device *adev, const struct amba_id *id)
 {
         struct dma_pl330_platdata *pdat;
         struct dma_pl330_dmac *pdmac;
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index cef584533ee8..3b0247e74cc4 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -4393,8 +4393,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev,
 /**
  * ppc440spe_adma_probe - probe the asynch device
  */
-static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev,
-                                          const struct of_device_id *match)
+static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct resource res;
@@ -4944,7 +4943,7 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {
 };
 MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match);
 
-static struct of_platform_driver ppc440spe_adma_driver = {
+static struct platform_driver ppc440spe_adma_driver = {
         .probe = ppc440spe_adma_probe,
         .remove = __devexit_p(ppc440spe_adma_remove),
         .driver = {
@@ -4962,7 +4961,7 @@ static __init int ppc440spe_adma_init(void)
         if (ret)
                 return ret;
 
-        ret = of_register_platform_driver(&ppc440spe_adma_driver);
+        ret = platform_driver_register(&ppc440spe_adma_driver);
         if (ret) {
                 pr_err("%s: failed to register platform driver\n",
                         __func__);
@@ -4996,7 +4995,7 @@ out_dev:
         /* User will not be able to enable h/w RAID-6 */
         pr_err("%s: failed to create RAID-6 driver interface\n",
                 __func__);
-        of_unregister_platform_driver(&ppc440spe_adma_driver);
+        platform_driver_unregister(&ppc440spe_adma_driver);
 out_reg:
         dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len);
         kfree(ppc440spe_dma_fifo_buf);
@@ -5011,7 +5010,7 @@ static void __exit ppc440spe_adma_exit(void)
                            &driver_attr_enable);
         driver_remove_file(&ppc440spe_adma_driver.driver,
                            &driver_attr_devices);
-        of_unregister_platform_driver(&ppc440spe_adma_driver);
+        platform_driver_unregister(&ppc440spe_adma_driver);
         dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len);
         kfree(ppc440spe_dma_fifo_buf);
 }
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 28720d3103c4..6451b581a70b 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -750,7 +750,7 @@ static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
                 return;
         }
 
-        /* Find the first not transferred desciptor */
+        /* Find the first not transferred descriptor */
         list_for_each_entry(desc, &sh_chan->ld_queue, node)
                 if (desc->mark == DESC_SUBMITTED) {
                         dev_dbg(sh_chan->dev, "Queue #%d to %d: %u@%x -> %x\n",
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 3b88a4e7c98a..f69f90a61873 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -629,7 +629,7 @@ static int td_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                 desc_node)
                 list_move(&td_desc->desc_node, &td_chan->free_list);
 
-        /* now tear down the runnning */
+        /* now tear down the running */
         __td_finish(td_chan);
         spin_unlock_bh(&td_chan->lock);