Merge tag 'ux500-dma40-for-arm-soc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers

From Linus Walleij:
DMA40 fixes for earlier submitted driver patches:
- Fix various error path and sparse bugs in the DMA40 driver
- Fix various compile errors in the ux500 crypto driver
  (dependent on the DMA40 changes).

* tag 'ux500-dma40-for-arm-soc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  crypto: ux500: use dmaengine_submit API
  crypto: ux500: use dmaengine_prep_slave_sg API
  crypto: ux500: use dmaengine_device_control API
  crypto: ux500/crypt: add missing __iomem qualifiers
  crypto: ux500/hash: add missing static qualifiers
  crypto: ux500/hash: use readl on iomem addresses
  dmaengine: ste_dma40: Declare memcpy config as static
  dmaengine: ste_dma40: fix error return code in d40_probe()

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index fa4f9a33a74d..5ab5880d5c90 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -78,7 +78,7 @@ static int dma40_memcpy_channels[] = {
 };
 
 /* Default configuration for physcial memcpy */
-struct stedma40_chan_cfg dma40_memcpy_conf_phy = {
+static struct stedma40_chan_cfg dma40_memcpy_conf_phy = {
         .mode = STEDMA40_MODE_PHYSICAL,
         .dir = DMA_MEM_TO_MEM,
 
@@ -92,7 +92,7 @@ struct stedma40_chan_cfg dma40_memcpy_conf_phy = {
 };
 
 /* Default configuration for logical memcpy */
-struct stedma40_chan_cfg dma40_memcpy_conf_log = {
+static struct stedma40_chan_cfg dma40_memcpy_conf_log = {
         .mode = STEDMA40_MODE_LOGICAL,
         .dir = DMA_MEM_TO_MEM,
 
@@ -3537,7 +3537,6 @@ static int __init d40_probe(struct platform_device *pdev)
 {
         struct stedma40_platform_data *plat_data = pdev->dev.platform_data;
         struct device_node *np = pdev->dev.of_node;
-        int err;
         int ret = -ENOENT;
         struct d40_base *base = NULL;
         struct resource *res = NULL;
@@ -3649,6 +3648,7 @@ static int __init d40_probe(struct platform_device *pdev)
                 base->lcpa_regulator = regulator_get(base->dev, "lcla_esram");
                 if (IS_ERR(base->lcpa_regulator)) {
                         d40_err(&pdev->dev, "Failed to get lcpa_regulator\n");
+                        ret = PTR_ERR(base->lcpa_regulator);
                         base->lcpa_regulator = NULL;
                         goto failure;
                 }
@@ -3664,13 +3664,13 @@ static int __init d40_probe(struct platform_device *pdev)
         }
 
         base->initialized = true;
-        err = d40_dmaengine_init(base, num_reserved_chans);
-        if (err)
+        ret = d40_dmaengine_init(base, num_reserved_chans);
+        if (ret)
                 goto failure;
 
         base->dev->dma_parms = &base->dma_parms;
-        err = dma_set_max_seg_size(base->dev, STEDMA40_MAX_SEG_SIZE);
-        if (err) {
+        ret = dma_set_max_seg_size(base->dev, STEDMA40_MAX_SEG_SIZE);
+        if (ret) {
                 d40_err(&pdev->dev, "Failed to set dma max seg size\n");
                 goto failure;
         }
@@ -3678,8 +3678,8 @@ static int __init d40_probe(struct platform_device *pdev)
         d40_hw_init(base);
 
         if (np) {
-                err = of_dma_controller_register(np, d40_xlate, NULL);
-                if (err && err != -ENODEV)
+                ret = of_dma_controller_register(np, d40_xlate, NULL);
+                if (ret)
                         dev_err(&pdev->dev,
                                 "could not register of_dma_controller\n");
         }