Skip to contentSkip to conversation

iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma()

PATCH Applied Wadim Egorov 3 participants 6 messages Sep 25, 2023 – Dec 4, 2023 IIO

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma()

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")

---
v2:
- Update description
- Drop line break after Fixes tag
- Move decision about optional DMA into probe/caller

---
 drivers/iio/adc/ti_am335x_adc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ti_am335x_adc.c +3 -1
index 8db7a01cb5fb..5f8795986995 100644
@@ -670,8 +670,10 @@ static int tiadc_probe(struct platform_device *pdev)
 	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;
 
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 8 lines · On Mon, 25 Sep 2023 15:44:27 +0200 Wadim Egorov <[email protected]> wrote:

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")

+CC Bhavya,

Could you take a look at this given you had comments on v1.

Thanks,

Jonathan

Quoted 25 lines

---
v2:
- Update description
- Drop line break after Fixes tag
- Move decision about optional DMA into probe/caller

---
 drivers/iio/adc/ti_am335x_adc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ti_am335x_adc.c +3 -1
index 8db7a01cb5fb..5f8795986995 100644
@@ -670,8 +670,10 @@ static int tiadc_probe(struct platform_device *pdev)
 	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;
 
#2 lore raw

Am 05.10.23 um 16:09 schrieb Jonathan Cameron:

Quoted 9 lines
Quoted 6 lines · On Mon, 25 Sep 2023 15:44:27 +0200 Wadim Egorov <[email protected]> wrote:

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().

Quoted 5 lines
Quoted 2 lines
Fixes f438b9da75eb ("drivers: iio: ti_am335x_adc: add dma support")

+CC Bhavya,

Could you take a look at this given you had comments on v1.

Bhavya, any comments on this?
If not, is there anything else that is blocking this patch?

Regards,
Wadim

Quoted 30 lines

Thanks,

Jonathan

Quoted 25 lines

---
v2:
- Update description
- Drop line break after Fixes tag
- Move decision about optional DMA into probe/caller

---
  drivers/iio/adc/ti_am335x_adc.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ti_am335x_adc.c +3 -1
index 8db7a01cb5fb..5f8795986995 100644
@@ -670,8 +670,10 @@ static int tiadc_probe(struct platform_device *pdev)
  	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;
 
Reviewed-by
#3 lore raw

LGTM !!🙂

Quoted 13 lines · Wadim Egorov

Am 05.10.23 um 16:09 schrieb Jonathan Cameron:

Quoted 11 lines
Quoted 8 lines · On Mon, 25 Sep 2023 15:44:27 +0200 Wadim Egorov <[email protected]> wrote:

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")
Quoted 38 lines
Quoted 3 lines

+CC Bhavya,

Could you take a look at this given you had comments on v1.

Bhavya, any comments on this?
If not, is there anything else that is blocking this patch?

Regards,
Wadim

Quoted 28 lines

Thanks,

Jonathan

Quoted 23 lines

---
v2:
   - Update description
   - Drop line break after Fixes tag
   - Move decision about optional DMA into probe/caller
---
  drivers/iio/adc/ti_am335x_adc.c | 4 +++-

  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ti_am335x_adc.c +3 -1
index 8db7a01cb5fb..5f8795986995 100644
@@ -670,8 +670,10 @@ static int tiadc_probe(struct platform_device 
 *pdev)
       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;
maintainer Applied
#4 lore raw
Quoted 15 lines · On Mon, 27 Nov 2023 15:14:29 +0530 Bhavya Kapoor <[email protected]> wrote:

LGTM !!🙂

Quoted 12 lines · Wadim Egorov

Am 05.10.23 um 16:09 schrieb Jonathan Cameron:

Quoted 10 lines
Quoted 7 lines · On Mon, 25 Sep 2023 15:44:27 +0200 Wadim Egorov <[email protected]> wrote:

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().

Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Fixes f438b9da75eb ("drivers: iio: ti_am335x_adc: add dma support")

Applied to the fixes-togreg branch of iio.git and marked for stable.

Quoted 39 lines
Quoted 39 lines
Quoted 3 lines

+CC Bhavya,

Could you take a look at this given you had comments on v1.

Bhavya, any comments on this?
If not, is there anything else that is blocking this patch?

Regards,
Wadim

Quoted 29 lines

Thanks,

Jonathan

Quoted 24 lines

---
v2:
   - Update description
   - Drop line break after Fixes tag
   - Move decision about optional DMA into probe/caller
---
  drivers/iio/adc/ti_am335x_adc.c | 4 +++-

  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ti_am335x_adc.c +3 -1
index 8db7a01cb5fb..5f8795986995 100644
@@ -670,8 +670,10 @@ static int tiadc_probe(struct platform_device 
 *pdev)
       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;  
#5 lore raw
In reply to Jonathan Cameron
Quoted 11 lines · Jonathan Cameron
Quoted 8 lines · On Mon, 25 Sep 2023 15:44:27 +0200 Wadim Egorov <[email protected]> wrote:

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")
Quoted 7 lines

+CC Bhavya,

Could you take a look at this given you had comments on v1.

Thanks,

Jonathan

Hi Jonathan, Patch Looks Good To Me and Should now work fine for every case.

Regards

~B-Kapoor

Quoted 26 lines
Quoted 26 lines

---
v2:
- Update description
- Drop line break after Fixes tag
- Move decision about optional DMA into probe/caller

---
  drivers/iio/adc/ti_am335x_adc.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ti_am335x_adc.c +3 -1
index 8db7a01cb5fb..5f8795986995 100644
@@ -670,8 +670,10 @@ static int tiadc_probe(struct platform_device *pdev)
  	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;