ARM: amba: of: convert to use amba_device_alloc
Convert DT code to use the new amba_device_alloc APIs. Acked-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
d5dc9271b2
commit
c0f72f8a92
@ -253,7 +253,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
|
|||||||
if (!of_device_is_available(node))
|
if (!of_device_is_available(node))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
|
dev = amba_device_alloc(NULL, 0, 0);
|
||||||
if (!dev)
|
if (!dev)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@ -283,14 +283,14 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto err_free;
|
goto err_free;
|
||||||
|
|
||||||
ret = amba_device_register(dev, &iomem_resource);
|
ret = amba_device_add(dev, &iomem_resource);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_free;
|
goto err_free;
|
||||||
|
|
||||||
return dev;
|
return dev;
|
||||||
|
|
||||||
err_free:
|
err_free:
|
||||||
kfree(dev);
|
amba_device_put(dev);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
#else /* CONFIG_ARM_AMBA */
|
#else /* CONFIG_ARM_AMBA */
|
||||||
|
Loading…
Reference in New Issue
Block a user