lkml.org 
[lkml]   [2013]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH RFC 30/51] DMA-API: dma: dw_dmac.c: convert to use dma_coerce_mask_and_coherent()
    Date
    This code sequence:
    if (!pdev->dev.dma_mask) {
    pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
    pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
    }
    bypasses the architectures check on the DMA mask. It can be replaced
    with dma_coerce_mask_and_coherent(), avoiding the direct initialization
    of this mask.

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    ---
    drivers/dma/dw/platform.c | 8 +++-----
    1 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c
    index 6c9449c..2608550 100644
    --- a/drivers/dma/dw/platform.c
    +++ b/drivers/dma/dw/platform.c
    @@ -191,11 +191,9 @@ static int dw_probe(struct platform_device *pdev)
    if (IS_ERR(chip->regs))
    return PTR_ERR(chip->regs);

    - /* Apply default dma_mask if needed */
    - if (!dev->dma_mask) {
    - dev->dma_mask = &dev->coherent_dma_mask;
    - dev->coherent_dma_mask = DMA_BIT_MASK(32);
    - }
    + err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
    + if (err)
    + return err;

    pdata = dev_get_platdata(dev);
    if (!pdata)
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2013-08-02 04:21    [W:4.967 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site