| Message ID | 20190404172503.12155-1-msuchanek@suse.de (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | c7266d26dc12bc056c0a7ffdbd4f4df41a8c25da |
| Headers | show |
| Series | dmaengine: bcm2835: Drop duplicate capability setting. | expand |
Am 04.04.19 um 19:25 schrieb Michal Suchanek: > Signed-off-by: Michal Suchanek <msuchanek@suse.de> Except of the point there is no commit log: Acked-by: Stefan Wahren <stefan.wahren@i2se.com> > --- > drivers/dma/bcm2835-dma.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c > index ec8a291d62ba..e38b19dd2895 100644 > --- a/drivers/dma/bcm2835-dma.c > +++ b/drivers/dma/bcm2835-dma.c > @@ -891,7 +891,6 @@ static int bcm2835_dma_probe(struct platform_device *pdev) > dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); > dma_cap_set(DMA_PRIVATE, od->ddev.cap_mask); > dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask); > - dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); > dma_cap_set(DMA_MEMCPY, od->ddev.cap_mask); > od->ddev.device_alloc_chan_resources = bcm2835_dma_alloc_chan_resources; > od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources;
On 04-04-19, 19:25, Michal Suchanek wrote: > Signed-off-by: Michal Suchanek <msuchanek@suse.de> > --- > drivers/dma/bcm2835-dma.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c > index ec8a291d62ba..e38b19dd2895 100644 > --- a/drivers/dma/bcm2835-dma.c > +++ b/drivers/dma/bcm2835-dma.c > @@ -891,7 +891,6 @@ static int bcm2835_dma_probe(struct platform_device *pdev) > dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); > dma_cap_set(DMA_PRIVATE, od->ddev.cap_mask); > dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask); > - dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); > dma_cap_set(DMA_MEMCPY, od->ddev.cap_mask); > od->ddev.device_alloc_chan_resources = bcm2835_dma_alloc_chan_resources; > od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources; Applied, thanks
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index ec8a291d62ba..e38b19dd2895 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -891,7 +891,6 @@ static int bcm2835_dma_probe(struct platform_device *pdev) dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); dma_cap_set(DMA_PRIVATE, od->ddev.cap_mask); dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask); - dma_cap_set(DMA_SLAVE, od->ddev.cap_mask); dma_cap_set(DMA_MEMCPY, od->ddev.cap_mask); od->ddev.device_alloc_chan_resources = bcm2835_dma_alloc_chan_resources; od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources;
Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- drivers/dma/bcm2835-dma.c | 1 - 1 file changed, 1 deletion(-)