Merge tag 's390-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / drivers / iio / adc / stm32-adc.c

diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 3eb9ebe..b3f31f1 100644 (file)
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -1805,13 +1805,9 @@ static int stm32_adc_dma_request(struct device *dev, struct iio_dev *indio_dev)
        adc->dma_chan = dma_request_chan(dev, "rx");
        if (IS_ERR(adc->dma_chan)) {
                ret = PTR_ERR(adc->dma_chan);
-               if (ret != -ENODEV) {
-                       if (ret != -EPROBE_DEFER)
-                               dev_err(dev,
-                                       "DMA channel request failed with %d\n",
-                                       ret);
-                       return ret;
-               }
+               if (ret != -ENODEV)
+                       return dev_err_probe(dev, ret,
+                                            "DMA channel request failed with\n");
 
                /* DMA is optional: fall back to IRQ mode */
                adc->dma_chan = NULL;