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: pruss: use devm_clk_get() for clk init

Browse Source 
This change uses devm_clk_get() to obtain a reference to the clock. It has
the benefit that clk_put() is no longer required, and cleans up the exit &
error path.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201119145059.48326-1-alexandru.ardelean@analog.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexandru Ardelean
2020-11-19 16:50:59 +02:00
committed by Greg Kroah-Hartman
parent 81113b0421
commit 68d6211971
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/uio/uio_pruss.c
View File

@@ -110,7 +110,6 @@ static void pruss_cleanup(struct device *dev, struct uio_pruss_dev *gdev)
gdev->sram_vaddr, gdev->sram_vaddr,
sram_pool_sz); sram_pool_sz);
clk_disable(gdev->pruss_clk); clk_disable(gdev->pruss_clk);
clk_put(gdev->pruss_clk);
} }
static int pruss_probe(struct platform_device *pdev) static int pruss_probe(struct platform_device *pdev)
@@ -131,7 +130,7 @@ static int pruss_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
/* 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 = devm_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");
return PTR_ERR(gdev->pruss_clk); return PTR_ERR(gdev->pruss_clk);
@@ -140,7 +139,7 @@ static int pruss_probe(struct platform_device *pdev)
ret = clk_enable(gdev->pruss_clk); ret = clk_enable(gdev->pruss_clk);
if (ret) { if (ret) {
dev_err(dev, "Failed to enable clock\n"); dev_err(dev, "Failed to enable clock\n");
goto err_clk_put; return ret;
} }
regs_prussio = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs_prussio = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -229,8 +228,6 @@ err_free_sram:
gen_pool_free(gdev->sram_pool, gdev->sram_vaddr, sram_pool_sz); gen_pool_free(gdev->sram_pool, gdev->sram_vaddr, sram_pool_sz);
err_clk_disable: err_clk_disable:
clk_disable(gdev->pruss_clk); clk_disable(gdev->pruss_clk);
err_clk_put:
clk_put(gdev->pruss_clk);
return ret; return ret;
} }