Commit 446b2a93 authored by Russell King's avatar Russell King
Browse files

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: default avatarGrant Likely <grant.likely@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 01edb5e1

drivers/amba/bus.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

}

drivers/of/platform.c

+0 −3
Original line number Diff line number Diff line
@@ -284,9 +284,6 @@ static struct amba_device *of_amba_device_create(struct device_node *node, 
	else

		of_device_make_bus_id(&dev->dev);



	/* setup amba-specific device info */

	dev->dma_mask = ~0;



	/* Allow the HW Peripheral ID to be overridden */

	prop = of_get_property(node, "arm,primecell-periphid", NULL);

	if (prop)

include/linux/amba/bus.h

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ struct amba_device { 
	struct device		dev;

	struct resource		res;

	struct clk		*pclk;

	u64			dma_mask;

	unsigned int		periphid;

	unsigned int		irq[AMBA_NR_IRQS];

};
@@ -131,7 +130,6 @@ struct amba_device name##_device = { \ 
struct amba_device name##_device = {				\

	.dev = __AMBA_DEV(busid, data, ~0ULL),			\

	.res = DEFINE_RES_MEM(base, SZ_4K),			\

	.dma_mask = ~0ULL,					\

	.irq = irqs,						\

	.periphid = id,						\

}