ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

uio: uio_fsl_elbc_gpcm: use device-managed allocators

Browse Source 
This change moves all the simple allocations to use device-managed
allocator functions. This way their life-time is tied to the
platform_device object, so when this gets free'd these allocations also get
cleaned up.
The final effect is that error & exit paths get cleaned up a bit.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201119154903.82099-3-alexandru.ardelean@analog.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexandru Ardelean
2020-11-19 17:49:02 +02:00
committed by Greg Kroah-Hartman
parent 16d546c42d
commit d57801c45f
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/uio/uio_fsl_elbc_gpcm.c
View File

@@ -299,7 +299,7 @@ static int get_of_data(struct fsl_elbc_gpcm *priv, struct device_node *node,
/* get optional uio name */ /* get optional uio name */
if (of_property_read_string(node, "uio_name", &dt_name) != 0) if (of_property_read_string(node, "uio_name", &dt_name) != 0)
dt_name = "eLBC_GPCM"; dt_name = "eLBC_GPCM";
*name = kstrdup(dt_name, GFP_KERNEL); *name = devm_kstrdup(priv->dev, dt_name, GFP_KERNEL);
if (!*name) if (!*name)
return -ENOMEM; return -ENOMEM;
@@ -324,7 +324,7 @@ static int uio_fsl_elbc_gpcm_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
/* allocate private data */ /* allocate private data */
priv = kzalloc(sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->dev = &pdev->dev; priv->dev = &pdev->dev;
@@ -334,14 +334,12 @@ static int uio_fsl_elbc_gpcm_probe(struct platform_device *pdev)
ret = get_of_data(priv, node, &res, &reg_br_new, &reg_or_new, ret = get_of_data(priv, node, &res, &reg_br_new, &reg_or_new,
&irq, &uio_name); &irq, &uio_name);
if (ret) if (ret)
goto out_err0; return ret;
/* allocate UIO structure */ /* allocate UIO structure */
info = kzalloc(sizeof(*info), GFP_KERNEL); info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
if (!info) { if (!info)
ret = -ENOMEM; return -ENOMEM;
goto out_err0;
}
/* get current BR/OR values */ /* get current BR/OR values */
reg_br_cur = in_be32(&priv->lbc->bank[priv->bank].br); reg_br_cur = in_be32(&priv->lbc->bank[priv->bank].br);
@@ -354,8 +352,7 @@ static int uio_fsl_elbc_gpcm_probe(struct platform_device *pdev)
!= fsl_lbc_addr(res.start)) { != fsl_lbc_addr(res.start)) {
dev_err(priv->dev, dev_err(priv->dev,
"bank in use by another peripheral\n"); "bank in use by another peripheral\n");
ret = -ENODEV; return -ENODEV;
goto out_err1;
} }
/* warn if behavior settings changing */ /* warn if behavior settings changing */
@@ -382,12 +379,11 @@ static int uio_fsl_elbc_gpcm_probe(struct platform_device *pdev)
info->mem[0].internal_addr = ioremap(res.start, resource_size(&res)); info->mem[0].internal_addr = ioremap(res.start, resource_size(&res));
if (!info->mem[0].internal_addr) { if (!info->mem[0].internal_addr) {
dev_err(priv->dev, "failed to map chip region\n"); dev_err(priv->dev, "failed to map chip region\n");
ret = -ENODEV; return -ENODEV;
goto out_err1;
} }
/* set all UIO data */ /* set all UIO data */
info->mem[0].name = kasprintf(GFP_KERNEL, "%pOFn", node); info->mem[0].name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOFn", node);
info->mem[0].addr = res.start; info->mem[0].addr = res.start;
info->mem[0].size = resource_size(&res); info->mem[0].size = resource_size(&res);
info->mem[0].memtype = UIO_MEM_PHYS; info->mem[0].memtype = UIO_MEM_PHYS;
@@ -428,12 +424,6 @@ out_err2:
if (priv->shutdown) if (priv->shutdown)
priv->shutdown(info, true); priv->shutdown(info, true);
iounmap(info->mem[0].internal_addr); iounmap(info->mem[0].internal_addr);
out_err1:
kfree(info->mem[0].name);
kfree(info);
out_err0:
kfree(uio_name);
kfree(priv);
return ret; return ret;
} }
@@ -447,10 +437,6 @@ static int uio_fsl_elbc_gpcm_remove(struct platform_device *pdev)
if (priv->shutdown) if (priv->shutdown)
priv->shutdown(info, false); priv->shutdown(info, false);
iounmap(info->mem[0].internal_addr); iounmap(info->mem[0].internal_addr);
kfree(info->mem[0].name);
kfree(info->name);
kfree(info);
kfree(priv);
return 0; return 0;