diff options
author | Pierre-Yves MORDRET <pierre-yves.mordret@st.com> | 2019-03-25 12:21:55 -0400 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2019-03-25 12:26:54 -0400 |
commit | 9dfec7ca0ba7ef987b3bbb71333d2f2182f5e030 (patch) | |
tree | cfa7d3cc977d0c850cb412a3a082621eaafb2730 | |
parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) |
dmaengine: stm32-mdma: Revert "dmaengine: stm32-mdma: Add a check on read_u32_array"
This reverts commit 906b40b246b0 ("dmaengine: stm32-mdma: Add a check on
read_u32_array")
As stated by bindings "st,ahb-addr-masks" is optional.
The statement inserted by this commit makes this property
mandatory and prevents MDMA to be probed in case property not present.
Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
-rw-r--r-- | drivers/dma/stm32-mdma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index 4e0eede599a8..ac0301b69593 100644 --- a/drivers/dma/stm32-mdma.c +++ b/drivers/dma/stm32-mdma.c | |||
@@ -1578,11 +1578,9 @@ static int stm32_mdma_probe(struct platform_device *pdev) | |||
1578 | 1578 | ||
1579 | dmadev->nr_channels = nr_channels; | 1579 | dmadev->nr_channels = nr_channels; |
1580 | dmadev->nr_requests = nr_requests; | 1580 | dmadev->nr_requests = nr_requests; |
1581 | ret = device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", | 1581 | device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", |
1582 | dmadev->ahb_addr_masks, | 1582 | dmadev->ahb_addr_masks, |
1583 | count); | 1583 | count); |
1584 | if (ret) | ||
1585 | return ret; | ||
1586 | dmadev->nr_ahb_addr_masks = count; | 1584 | dmadev->nr_ahb_addr_masks = count; |
1587 | 1585 | ||
1588 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1586 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |