| Message ID | 1553530915-1961-1-git-send-email-pierre-yves.mordret@st.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 9dfec7ca0ba7ef987b3bbb71333d2f2182f5e030 |
| Headers | show |
| Series | [v2] dmaengine: stm32-mdma: Revert "Add a check on read_u32_array" | expand |
On 25-03-19, 17:21, Pierre-Yves MORDRET wrote: > This reverts commit 906b40b246b0 ("Add a check on read_u32_array") This and patch title should contain: 906b40b246b0 ("dmaengine: stm32-mdma: Add a check on read_u32_array") I have fixed it up and applied. Thanks > 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> > --- > Version history: > v2: > * review commit message > v1: > * Initial > --- > --- > drivers/dma/stm32-mdma.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c > index 4e0eede..ac0301b 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) > > dmadev->nr_channels = nr_channels; > dmadev->nr_requests = nr_requests; > - ret = device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", > + device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", > dmadev->ahb_addr_masks, > count); > - if (ret) > - return ret; > dmadev->nr_ahb_addr_masks = count; > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > -- > 2.7.4
On 3/25/19 5:28 PM, Vinod Koul wrote: > On 25-03-19, 17:21, Pierre-Yves MORDRET wrote: >> This reverts commit 906b40b246b0 ("Add a check on read_u32_array") > > This and patch title should contain: > 906b40b246b0 ("dmaengine: stm32-mdma: Add a check on read_u32_array") > > I have fixed it up and applied. Darn it, sorry. Many thanks btw :) > > Thanks > >> 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> >> --- >> Version history: >> v2: >> * review commit message >> v1: >> * Initial >> --- >> --- >> drivers/dma/stm32-mdma.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c >> index 4e0eede..ac0301b 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) >> >> dmadev->nr_channels = nr_channels; >> dmadev->nr_requests = nr_requests; >> - ret = device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", >> + device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", >> dmadev->ahb_addr_masks, >> count); >> - if (ret) >> - return ret; >> dmadev->nr_ahb_addr_masks = count; >> >> res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> -- >> 2.7.4 >
diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index 4e0eede..ac0301b 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) dmadev->nr_channels = nr_channels; dmadev->nr_requests = nr_requests; - ret = device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", + device_property_read_u32_array(&pdev->dev, "st,ahb-addr-masks", dmadev->ahb_addr_masks, count); - if (ret) - return ret; dmadev->nr_ahb_addr_masks = count; res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
This reverts commit 906b40b246b0 ("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> --- Version history: v2: * review commit message v1: * Initial --- --- drivers/dma/stm32-mdma.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)