Commit dc341c4e authored by Laurentiu Tudor's avatar Laurentiu Tudor Committed by Greg Kroah-Hartman

staging: fsl-mc: don't use devres api for refcounted objects

Mixing two memory management systems, in this case
managed device resource api and refcounted objects
is a bad idea. Lifetime of an object is controlled
by its refcount so allocating it with other apis
that have their own lifetime control is not ok.
Drop devm_*() apis in favor of plain allocations.
Signed-off-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95b3523b
...@@ -430,7 +430,7 @@ static void fsl_mc_device_release(struct device *dev) ...@@ -430,7 +430,7 @@ static void fsl_mc_device_release(struct device *dev)
mc_bus = to_fsl_mc_bus(mc_dev); mc_bus = to_fsl_mc_bus(mc_dev);
if (mc_bus) if (mc_bus)
devm_kfree(mc_dev->dev.parent, mc_bus); kfree(mc_bus);
else else
kmem_cache_free(mc_dev_cache, mc_dev); kmem_cache_free(mc_dev_cache, mc_dev);
} }
...@@ -457,7 +457,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, ...@@ -457,7 +457,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
/* /*
* Allocate an MC bus device object: * Allocate an MC bus device object:
*/ */
mc_bus = devm_kzalloc(parent_dev, sizeof(*mc_bus), GFP_KERNEL); mc_bus = kzalloc(sizeof(*mc_bus), GFP_KERNEL);
if (!mc_bus) if (!mc_bus)
return -ENOMEM; return -ENOMEM;
...@@ -562,7 +562,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, ...@@ -562,7 +562,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc,
error_cleanup_dev: error_cleanup_dev:
kfree(mc_dev->regions); kfree(mc_dev->regions);
if (mc_bus) if (mc_bus)
devm_kfree(parent_dev, mc_bus); kfree(mc_bus);
else else
kmem_cache_free(mc_dev_cache, mc_dev); kmem_cache_free(mc_dev_cache, mc_dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment