ramips: 6.1: mt7621-dma: apply dma handle error from device_reset patch

Apply the "109-drivers-mt7621-dma-handle-error-from-device_reset.patch"
directly on the downstream maintained dma driver.

Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c b/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c
index 8aebced277bd141d0399b808f02da1ab808a5034..a3a9a7f4ae9d09b93218affd9ebdb3b98b555a4a 100644 (file)
--- a/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c
+++ b/target/linux/ramips/files/drivers/dma/mediatek/hsdma-mt7621.c
@@ -680,7 +680,9 @@ static int mtk_hsdma_probe(struct platform_device *pdev)
                return ret;
        }
 
-       device_reset(&pdev->dev);
+       ret = device_reset(&pdev->dev);
+       if (ret)
+               dev_err(&pdev->dev, "failed to reset device\n");
 
        dd = &hsdma->ddev;
        dma_cap_set(DMA_MEMCPY, dd->cap_mask);

diff --git a/target/linux/ramips/patches-6.1/109-drivers-mt7621-dma-handle-error-from-device_reset.patch b/target/linux/ramips/patches-6.1/109-drivers-mt7621-dma-handle-error-from-device_reset.patch
deleted file mode 100644 (file)
index a454333..0000000
--- a/target/linux/ramips/patches-6.1/109-drivers-mt7621-dma-handle-error-from-device_reset.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3f6dfa25128e428acfba20792bc7506d58806baa Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Sun, 7 May 2023 01:06:17 +0200
-Subject: [PATCH] drivers: mt7621-dma: handle error from device_reset
-
-Handle error from device reset to fix compilation warning.
-Fix compilation warning:
-drivers/staging/mt7621-dma/hsdma-mt7621.c: In function 'mtk_hsdma_probe':
-drivers/staging/mt7621-dma/hsdma-mt7621.c:685:9: error: ignoring return value of 'device_reset' declared with attribute 'warn_unused_result' [-Werror=unused-result]
-  685 |         device_reset(&pdev->dev);
-      |         ^~~~~~~~~~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
----
- drivers/staging/mt7621-dma/hsdma-mt7621.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/mt7621-dma/hsdma-mt7621.c
-+++ b/drivers/staging/mt7621-dma/hsdma-mt7621.c
-@@ -682,7 +682,9 @@ static int mtk_hsdma_probe(struct platfo
-               return ret;
-       }
- 
--      device_reset(&pdev->dev);
-+      ret = device_reset(&pdev->dev);
-+      if (ret)
-+              dev_err(&pdev->dev, "failed to reset device\n");
- 
-       dd = &hsdma->ddev;
-       dma_cap_set(DMA_MEMCPY, dd->cap_mask);