Skip to content

Commit

Permalink
ARM: amba: mxs: convert to use amba_device_alloc
Browse files Browse the repository at this point in the history
Convert MXS to use the new amba_device_alloc APIs.

Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jan 25, 2012
1 parent 9a25706 commit 039e7ad
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions arch/arm/mach-mxs/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,18 @@ struct platform_device *__init mxs_add_platform_device_dmamask(

int __init mxs_add_amba_device(const struct amba_device *dev)
{
struct amba_device *adev = kmalloc(sizeof(*adev), GFP_KERNEL);
struct amba_device *adev = amba_device_alloc(dev->dev.init_name,
dev->res.start, resource_size(&dev->res));

if (!adev) {
pr_err("%s: failed to allocate memory", __func__);
return -ENOMEM;
}

*adev = *dev;
adev->irq[0] = dev->irq[0];
adev->irq[1] = dev->irq[1];

return amba_device_register(adev, &iomem_resource);
return amba_device_add(adev, &iomem_resource);
}

struct device mxs_apbh_bus = {
Expand Down

0 comments on commit 039e7ad

Please sign in to comment.