4.4-stable patches

added patches:
	dmaengine-coh901318-remove-unused-variable.patch

diff --git a/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch b/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch
index 7a38122e9d377780a6ba4e48dc72702c07b84684..60a282c2d2fae9c166973879442fd1761eb73d13 100644 (file)
--- a/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch
+++ b/queue-4.4/dmaengine-coh901318-fix-a-double-lock-bug.patch
@@ -20,15 +20,14 @@ Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
 Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
 Signed-off-by: Vinod Koul <vkoul@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/dma/coh901318.c | 4 ----
+ drivers/dma/coh901318.c |    4 ----
  1 file changed, 4 deletions(-)
 
-diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
-index c340ca9bd2b5d..69852a99fc243 100644
 --- a/drivers/dma/coh901318.c
 +++ b/drivers/dma/coh901318.c
-@@ -1815,8 +1815,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
+@@ -1815,8 +1815,6 @@ static int coh901318_config(struct coh90
        int channel = cohc->id;
        void __iomem *virtbase = cohc->base->virtbase;
  
@@ -37,7 +36,7 @@ index c340ca9bd2b5d..69852a99fc243 100644
        if (param)
                p = param;
        else
-@@ -1836,8 +1834,6 @@ static int coh901318_config(struct coh901318_chan *cohc,
+@@ -1836,8 +1834,6 @@ static int coh901318_config(struct coh90
        coh901318_set_conf(cohc, p->config);
        coh901318_set_ctrl(cohc, p->ctrl_lli_last);
  
@@ -46,6 +45,3 @@ index c340ca9bd2b5d..69852a99fc243 100644
        return 0;
  }
  
--- 
-2.20.1
-

diff --git a/queue-4.4/dmaengine-coh901318-remove-unused-variable.patch b/queue-4.4/dmaengine-coh901318-remove-unused-variable.patch
new file mode 100644 (file)
index 0000000..de44711
--- /dev/null
+++ b/queue-4.4/dmaengine-coh901318-remove-unused-variable.patch
@@ -0,0 +1,36 @@
+From 35faaf0df42d285b40f8a6310afbe096720f7758 Mon Sep 17 00:00:00 2001
+From: Vinod Koul <vkoul@kernel.org>
+Date: Mon, 26 Nov 2018 13:34:15 +0530
+Subject: dmaengine: coh901318: Remove unused variable
+
+From: Vinod Koul <vkoul@kernel.org>
+
+commit 35faaf0df42d285b40f8a6310afbe096720f7758 upstream.
+
+Commit 627469e4445b ("dmaengine: coh901318: Fix a double-lock bug") left
+flags variable unused, so remove it to fix the warning.
+
+drivers/dma/coh901318.c: In function 'coh901318_config':
+drivers/dma/coh901318.c:1805:16: warning: unused variable 'flags' [-Wunused-variable]
+  unsigned long flags;
+                ^~~~~
+
+Fixes: 627469e4445b ("dmaengine: coh901318: Fix a double-lock bug")
+Reported-By: Stephen Rothwell <sfr@canb.auug.org.au>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/dma/coh901318.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/dma/coh901318.c
++++ b/drivers/dma/coh901318.c
+@@ -1810,7 +1810,6 @@ static struct dma_chan *coh901318_xlate(
+ static int coh901318_config(struct coh901318_chan *cohc,
+                           struct coh901318_params *param)
+ {
+-      unsigned long flags;
+       const struct coh901318_params *p;
+       int channel = cohc->id;
+       void __iomem *virtbase = cohc->base->virtbase;

diff --git a/queue-4.4/series b/queue-4.4/series
index 1c86921cec65a3cb48a052d5c772bef0b792aeb3..cad2ce50014096d1e21820ab525f3edc2cbba9d6 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -29,6 +29,7 @@ rtc-dt-binding-abx80x-fix-resistance-scale.patch
 arm-dts-exynos-use-samsung-soc-specific-compatible-f.patch
 media-coda-fix-memory-corruption-in-case-more-than-3.patch
 dmaengine-coh901318-fix-a-double-lock-bug.patch
+dmaengine-coh901318-remove-unused-variable.patch
 acpi-fix-acpi_find_child_device-invocation-in-acpi_p.patch
 dma-mapping-fix-return-type-of-dma_set_max_seg_size.patch
 altera-stapl-check-for-a-null-key-before-strcasecmp-.patch