| Message ID | E1VMnRj-0007sg-1Z@rmk-PC.arm.linux.org.uk |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Sep 20, 2013 at 12:15:39AM +0100, Russell King wrote: > register_platform_device_full() can setup the DMA mask provided the > appropriate member is set in struct platform_device_info. So lets > make that be the case. This avoids a direct reference to the DMA > masks by this driver. > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Vinod Koul <vinod.koul@intel.com> This also brings me question that should we force the driver to use the dma_set_mask_and_coherent() API or they have below flexiblity too? ~Vinod > --- > drivers/dma/edma.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c > index ff50ff4..7f9fe30 100644 > --- a/drivers/dma/edma.c > +++ b/drivers/dma/edma.c > @@ -702,11 +702,13 @@ static struct platform_device *pdev0, *pdev1; > static const struct platform_device_info edma_dev_info0 = { > .name = "edma-dma-engine", > .id = 0, > + .dma_mask = DMA_BIT_MASK(32), > }; > > static const struct platform_device_info edma_dev_info1 = { > .name = "edma-dma-engine", > .id = 1, > + .dma_mask = DMA_BIT_MASK(32), > }; > > static int edma_init(void) > @@ -720,8 +722,6 @@ static int edma_init(void) > ret = PTR_ERR(pdev0); > goto out; > } > - pdev0->dev.dma_mask = &pdev0->dev.coherent_dma_mask; > - pdev0->dev.coherent_dma_mask = DMA_BIT_MASK(32); > } > > if (EDMA_CTLRS == 2) { > @@ -731,8 +731,6 @@ static int edma_init(void) > platform_device_unregister(pdev0); > ret = PTR_ERR(pdev1); > } > - pdev1->dev.dma_mask = &pdev1->dev.coherent_dma_mask; > - pdev1->dev.coherent_dma_mask = DMA_BIT_MASK(32); > } > > out: > -- > 1.7.4.4 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index ff50ff4..7f9fe30 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -702,11 +702,13 @@ static struct platform_device *pdev0, *pdev1; static const struct platform_device_info edma_dev_info0 = { .name = "edma-dma-engine", .id = 0, + .dma_mask = DMA_BIT_MASK(32), }; static const struct platform_device_info edma_dev_info1 = { .name = "edma-dma-engine", .id = 1, + .dma_mask = DMA_BIT_MASK(32), }; static int edma_init(void) @@ -720,8 +722,6 @@ static int edma_init(void) ret = PTR_ERR(pdev0); goto out; } - pdev0->dev.dma_mask = &pdev0->dev.coherent_dma_mask; - pdev0->dev.coherent_dma_mask = DMA_BIT_MASK(32); } if (EDMA_CTLRS == 2) { @@ -731,8 +731,6 @@ static int edma_init(void) platform_device_unregister(pdev0); ret = PTR_ERR(pdev1); } - pdev1->dev.dma_mask = &pdev1->dev.coherent_dma_mask; - pdev1->dev.coherent_dma_mask = DMA_BIT_MASK(32); } out:
register_platform_device_full() can setup the DMA mask provided the appropriate member is set in struct platform_device_info. So lets make that be the case. This avoids a direct reference to the DMA masks by this driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/dma/edma.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)