On Fri, Jan 20, 2012 at 10:23:24 +0100, Russell King - ARM Linux wrote:
> Convert ux500 to use the new amba_device_alloc APIs.
> 
> Signed-off-by: Russell King <[email protected]>

Acked-by: srinidhi kasagar <[email protected]>

> ---
>  arch/arm/mach-ux500/devices-common.c |   12 +++---------
>  1 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/mach-ux500/devices-common.c 
> b/arch/arm/mach-ux500/devices-common.c
> index c563e54..e8c34fa 100644
> --- a/arch/arm/mach-ux500/devices-common.c
> +++ b/arch/arm/mach-ux500/devices-common.c
> @@ -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);
>       }
>  
> -- 
> 1.7.4.4
> 
_______________________________________________
devicetree-discuss mailing list
[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss

Reply via email to