Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46d4bb9b authored by Russell King's avatar Russell King
Browse files

ARM: amba: ux500: convert to use amba_device_alloc 



Convert ux500 to use the new amba_device_alloc APIs.

Acked-by: default avatarsrinidhi kasagar <srinidhi.kasagar@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c0f72f8a

arch/arm/mach-ux500/devices-common.c

+3 −9
Original line number Diff line number Diff line
@@ -26,16 +26,10 @@ dbx500_add_amba_device(const char *name, resource_size_t base, 
	struct amba_device *dev;

	int ret;



	dev = kzalloc(sizeof *dev, GFP_KERNEL);

	dev = amba_device_alloc(name, base, SZ_4K);

	if (!dev)

		return ERR_PTR(-ENOMEM);



	dev->dev.init_name = name;



	dev->res.start = base;

	dev->res.end = base + SZ_4K - 1;

	dev->res.flags = IORESOURCE_MEM;



	dev->dma_mask = DMA_BIT_MASK(32);

	dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
@@ -46,9 +40,9 @@ dbx500_add_amba_device(const char *name, resource_size_t base, 


	dev->dev.platform_data = pdata;



	ret = amba_device_register(dev, &iomem_resource);

	ret = amba_device_add(dev, &iomem_resource);

	if (ret) {

		kfree(dev);

		amba_device_put(dev);

		return ERR_PTR(ret);

	}