DMA-API: amba: get rid of separate dma_mask

AMBA Primecell devices always treat streaming and coherent DMA exactly
the same, so there's no point in having the masks separated.

Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index c6707278a6bb..c4876ac9151a 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -552,7 +552,6 @@ amba_aphb_device_add(struct device *parent, const char *name,
         if (!dev)
                 return ERR_PTR(-ENOMEM);
 
-        dev->dma_mask = dma_mask;
         dev->dev.coherent_dma_mask = dma_mask;
         dev->irq[0] = irq1;
         dev->irq[1] = irq2;
@@ -619,7 +618,7 @@ static void amba_device_initialize(struct amba_device *dev, const char *name)
                 dev_set_name(&dev->dev, "%s", name);
         dev->dev.release = amba_device_release;
         dev->dev.bus = &amba_bustype;
-        dev->dev.dma_mask = &dev->dma_mask;
+        dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
         dev->res.name = dev_name(&dev->dev);
 }
 
@@ -663,9 +662,6 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
         amba_device_initialize(dev, dev->dev.init_name);
         dev->dev.init_name = NULL;
 
-        if (!dev->dev.coherent_dma_mask && dev->dma_mask)
-                dev_warn(&dev->dev, "coherent dma mask is unset\n");
-
         return amba_device_add(dev, parent);
 }