Merge tag 'sound-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux.git] / drivers / dma / stm32-mdma.c

diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c
index 1311de74bfdde5f817937fd2a929a1e02ce00c0f..5838311cf990044f8a0b962590e851ccedc805f1 100644 (file)
--- a/drivers/dma/stm32-mdma.c
+++ b/drivers/dma/stm32-mdma.c
@@ -1555,8 +1555,7 @@ static int stm32_mdma_probe(struct platform_device *pdev)
                         nr_requests);
        }
 
-       count = device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks",
-                                              NULL, 0);
+       count = device_property_count_u32(&pdev->dev, "st,ahb-addr-masks");
        if (count < 0)
                count = 0;
 
@@ -1638,10 +1637,8 @@ static int stm32_mdma_probe(struct platform_device *pdev)
        }
 
        dmadev->irq = platform_get_irq(pdev, 0);
-       if (dmadev->irq < 0) {
-               dev_err(&pdev->dev, "failed to get IRQ\n");
+       if (dmadev->irq < 0)
                return dmadev->irq;
-       }
 
        ret = devm_request_irq(&pdev->dev, dmadev->irq, stm32_mdma_irq_handler,
                               0, dev_name(&pdev->dev), dmadev);