openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

uio: pruss: move simple allocations to dem_ equivalents 

This change moves the simple allocations to their device-managed
equivalents.
This cleans up some error/exit paths.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201111112242.62116-1-alexandru.ardelean@analog.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexandru Ardelean 2020-11-11 13:22:41 +02:00 committed by Greg Kroah-Hartman
parent 439e8f6f1e
commit cfd3443e2d
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/uio/uio_pruss.c
View File

@ -99,7 +99,6 @@ static void pruss_cleanup(struct device *dev, struct uio_pruss_dev *gdev)
for (cnt = 0; cnt < MAX_PRUSS_EVT; cnt++, p++) { for (cnt = 0; cnt < MAX_PRUSS_EVT; cnt++, p++) {
uio_unregister_device(p); uio_unregister_device(p);
kfree(p->name);
} }
iounmap(gdev->prussio_vaddr); iounmap(gdev->prussio_vaddr);
if (gdev->ddr_vaddr) { if (gdev->ddr_vaddr) {
@ -110,10 +109,8 @@ static void pruss_cleanup(struct device *dev, struct uio_pruss_dev *gdev)
gen_pool_free(gdev->sram_pool, gen_pool_free(gdev->sram_pool,
gdev->sram_vaddr, gdev->sram_vaddr,
sram_pool_sz); sram_pool_sz);
kfree(gdev->info);
clk_disable(gdev->pruss_clk); clk_disable(gdev->pruss_clk);
clk_put(gdev->pruss_clk); clk_put(gdev->pruss_clk);
kfree(gdev);
} }
static int pruss_probe(struct platform_device *pdev) static int pruss_probe(struct platform_device *pdev)
@ -125,22 +122,19 @@ static int pruss_probe(struct platform_device *pdev)
int ret, cnt, i, len; int ret, cnt, i, len;
struct uio_pruss_pdata *pdata = dev_get_platdata(dev); struct uio_pruss_pdata *pdata = dev_get_platdata(dev);
gdev = kzalloc(sizeof(struct uio_pruss_dev), GFP_KERNEL); gdev = devm_kzalloc(dev, sizeof(struct uio_pruss_dev), GFP_KERNEL);
if (!gdev) if (!gdev)
return -ENOMEM; return -ENOMEM;
gdev->info = kcalloc(MAX_PRUSS_EVT, sizeof(*p), GFP_KERNEL); gdev->info = devm_kcalloc(dev, MAX_PRUSS_EVT, sizeof(*p), GFP_KERNEL);
if (!gdev->info) { if (!gdev->info)
ret = -ENOMEM; return -ENOMEM;
goto err_free_gdev;
}
/* Power on PRU in case its not done as part of boot-loader */ /* Power on PRU in case its not done as part of boot-loader */
gdev->pruss_clk = clk_get(dev, "pruss"); gdev->pruss_clk = clk_get(dev, "pruss");
if (IS_ERR(gdev->pruss_clk)) { if (IS_ERR(gdev->pruss_clk)) {
dev_err(dev, "Failed to get clock\n"); dev_err(dev, "Failed to get clock\n");
ret = PTR_ERR(gdev->pruss_clk); return PTR_ERR(gdev->pruss_clk);
goto err_free_info;
} }
ret = clk_enable(gdev->pruss_clk); ret = clk_enable(gdev->pruss_clk);
@ -206,7 +200,7 @@ static int pruss_probe(struct platform_device *pdev)
p->mem[2].size = extram_pool_sz; p->mem[2].size = extram_pool_sz;
p->mem[2].memtype = UIO_MEM_PHYS; p->mem[2].memtype = UIO_MEM_PHYS;
p->name = kasprintf(GFP_KERNEL, "pruss_evt%d", cnt); p->name = devm_kasprintf(dev, GFP_KERNEL, "pruss_evt%d", cnt);
p->version = DRV_VERSION; p->version = DRV_VERSION;
/* Register PRUSS IRQ lines */ /* Register PRUSS IRQ lines */
@ -215,10 +209,8 @@ static int pruss_probe(struct platform_device *pdev)
p->priv = gdev; p->priv = gdev;
ret = uio_register_device(dev, p); ret = uio_register_device(dev, p);
if (ret < 0) { if (ret < 0)
kfree(p->name);
goto err_unloop; goto err_unloop;
}
} }
platform_set_drvdata(pdev, gdev); platform_set_drvdata(pdev, gdev);
@ -227,7 +219,6 @@ static int pruss_probe(struct platform_device *pdev)
err_unloop: err_unloop:
for (i = 0, p = gdev->info; i < cnt; i++, p++) { for (i = 0, p = gdev->info; i < cnt; i++, p++) {
uio_unregister_device(p); uio_unregister_device(p);
kfree(p->name);
} }
iounmap(gdev->prussio_vaddr); iounmap(gdev->prussio_vaddr);
err_free_ddr_vaddr: err_free_ddr_vaddr:
@ -240,10 +231,6 @@ static int pruss_probe(struct platform_device *pdev)
clk_disable(gdev->pruss_clk); clk_disable(gdev->pruss_clk);
err_clk_put: err_clk_put:
clk_put(gdev->pruss_clk); clk_put(gdev->pruss_clk);
err_free_info:
kfree(gdev->info);
err_free_gdev:
kfree(gdev);
return ret; return ret;
} }