drop iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch from...

diff --git a/queue-4.14/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch b/queue-4.14/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
deleted file mode 100644 (file)
index 33ba0cc..0000000
--- a/queue-4.14/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 60576e84c187043cef11f11d015249e71151d35a Mon Sep 17 00:00:00 2001
-From: Wadim Egorov <w.egorov@phytec.de>
-Date: Mon, 25 Sep 2023 15:44:27 +0200
-Subject: iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma()
-
-From: Wadim Egorov <w.egorov@phytec.de>
-
-commit 60576e84c187043cef11f11d015249e71151d35a upstream.
-
-Fix wrong handling of a DMA request where the probing only failed
-if -EPROPE_DEFER was returned. Instead, let us fail if a non -ENODEV
-value is returned. This makes DMAs explicitly optional. Even if the
-DMA request is unsuccessfully, the ADC can still work properly.
-We do also handle the defer probe case by making use of dev_err_probe().
-
-Fixes: f438b9da75eb ("drivers: iio: ti_am335x_adc: add dma support")
-Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
-Reviewed-by: Bhavya Kapoor <b-kapoor@ti.com>
-Link: https://lore.kernel.org/r/20230925134427.214556-1-w.egorov@phytec.de
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/iio/adc/ti_am335x_adc.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/iio/adc/ti_am335x_adc.c
-+++ b/drivers/iio/adc/ti_am335x_adc.c
-@@ -654,8 +654,10 @@ static int tiadc_probe(struct platform_d
-       platform_set_drvdata(pdev, indio_dev);
- 
-       err = tiadc_request_dma(pdev, adc_dev);
--      if (err && err == -EPROBE_DEFER)
-+      if (err && err != -ENODEV) {
-+              dev_err_probe(&pdev->dev, err, "DMA request failed\n");
-               goto err_dma;
-+      }
- 
-       return 0;
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 848cdaa37603f026c8c866d73068a42600161635..ffb8ffa629c5efaf769ff06fd50a444b3ad8d570 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -8,7 +8,6 @@ pinctrl-at91-pio4-use-dedicated-lock-class-for-irq.patch
 iio-imu-inv_mpu6050-fix-an-error-code-problem-in-inv.patch
 input-ipaq-micro-keys-add-error-handling-for-devm_km.patch
 iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch
-iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
 wifi-cfg80211-add-my-certificate.patch
 wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch
 usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch

diff --git a/queue-4.19/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch b/queue-4.19/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
deleted file mode 100644 (file)
index 95aa919..0000000
--- a/queue-4.19/iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 60576e84c187043cef11f11d015249e71151d35a Mon Sep 17 00:00:00 2001
-From: Wadim Egorov <w.egorov@phytec.de>
-Date: Mon, 25 Sep 2023 15:44:27 +0200
-Subject: iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma()
-
-From: Wadim Egorov <w.egorov@phytec.de>
-
-commit 60576e84c187043cef11f11d015249e71151d35a upstream.
-
-Fix wrong handling of a DMA request where the probing only failed
-if -EPROPE_DEFER was returned. Instead, let us fail if a non -ENODEV
-value is returned. This makes DMAs explicitly optional. Even if the
-DMA request is unsuccessfully, the ADC can still work properly.
-We do also handle the defer probe case by making use of dev_err_probe().
-
-Fixes: f438b9da75eb ("drivers: iio: ti_am335x_adc: add dma support")
-Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
-Reviewed-by: Bhavya Kapoor <b-kapoor@ti.com>
-Link: https://lore.kernel.org/r/20230925134427.214556-1-w.egorov@phytec.de
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/iio/adc/ti_am335x_adc.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/iio/adc/ti_am335x_adc.c
-+++ b/drivers/iio/adc/ti_am335x_adc.c
-@@ -653,8 +653,10 @@ static int tiadc_probe(struct platform_d
-       platform_set_drvdata(pdev, indio_dev);
- 
-       err = tiadc_request_dma(pdev, adc_dev);
--      if (err && err == -EPROBE_DEFER)
-+      if (err && err != -ENODEV) {
-+              dev_err_probe(&pdev->dev, err, "DMA request failed\n");
-               goto err_dma;
-+      }
- 
-       return 0;
- 

diff --git a/queue-4.19/series b/queue-4.19/series
index 6f7e016d172cd6912dec2974f22d4ebbfceb88ba..2ef92f02cb920dd591a9ff7e70db56c4d03c287b 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -24,7 +24,6 @@ input-ipaq-micro-keys-add-error-handling-for-devm_km.patch
 scsi-bnx2fc-remove-set-but-not-used-variable-oxid.patch
 scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch
 iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch
-iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
 wifi-cfg80211-add-my-certificate.patch
 wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch
 usb-serial-ftdi_sio-update-actisense-pids-constant-names.patch