mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

[media] s5p-mfc: Use devm_* functions in s5p_mfc.c file

Browse source 
devm_* functions are device managed functions and make error handling
and cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sachin Kamat 2012-05-14 08:22:27 -03:00 committed by Mauro Carvalho Chehab
parent 5b58b95405
commit d310f478e2
2 changed files with 14 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
drivers/media/video/s5p-mfc/s5p_mfc.c
View file

@ -948,7 +948,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
int ret; int ret;
pr_debug("%s++\n", __func__); pr_debug("%s++\n", __func__);
dev = kzalloc(sizeof *dev, GFP_KERNEL); dev = devm_kzalloc(&pdev->dev, sizeof *dev, GFP_KERNEL);
if (!dev) { if (!dev) {
dev_err(&pdev->dev, "Not enough memory for MFC device\n"); dev_err(&pdev->dev, "Not enough memory for MFC device\n");
return -ENOMEM; return -ENOMEM;
@ -959,49 +959,35 @@ static int s5p_mfc_probe(struct platform_device *pdev)
dev->plat_dev = pdev; dev->plat_dev = pdev;
if (!dev->plat_dev) { if (!dev->plat_dev) {
dev_err(&pdev->dev, "No platform data specified\n"); dev_err(&pdev->dev, "No platform data specified\n");
ret = -ENODEV; return -ENODEV;
goto err_dev;
} }
ret = s5p_mfc_init_pm(dev); ret = s5p_mfc_init_pm(dev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to get mfc clock source\n"); dev_err(&pdev->dev, "failed to get mfc clock source\n");
goto err_clk; return ret;
} }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) {
dev_err(&pdev->dev, "failed to get memory region resource\n");
ret = -ENOENT;
goto err_res;
}
dev->mfc_mem = request_mem_region(res->start, resource_size(res), dev->regs_base = devm_request_and_ioremap(&pdev->dev, res);
pdev->name);
if (dev->mfc_mem == NULL) {
dev_err(&pdev->dev, "failed to get memory region\n");
ret = -ENOENT;
goto err_mem_reg;
}
dev->regs_base = ioremap(dev->mfc_mem->start, resource_size(dev->mfc_mem));
if (dev->regs_base == NULL) { if (dev->regs_base == NULL) {
dev_err(&pdev->dev, "failed to ioremap address region\n"); dev_err(&pdev->dev, "Failed to obtain io memory\n");
ret = -ENOENT; return -ENOENT;
goto err_ioremap;
} }
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (res == NULL) { if (res == NULL) {
dev_err(&pdev->dev, "failed to get irq resource\n"); dev_err(&pdev->dev, "failed to get irq resource\n");
ret = -ENOENT; ret = -ENOENT;
goto err_get_res; goto err_res;
} }
dev->irq = res->start; dev->irq = res->start;
ret = request_irq(dev->irq, s5p_mfc_irq, IRQF_DISABLED, pdev->name, ret = devm_request_irq(&pdev->dev, dev->irq, s5p_mfc_irq,
dev); IRQF_DISABLED, pdev->name, dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to install irq (%d)\n", ret); dev_err(&pdev->dev, "Failed to install irq (%d)\n", ret);
goto err_req_irq; goto err_res;
} }
dev->mem_dev_l = device_find_child(&dev->plat_dev->dev, "s5p-mfc-l", dev->mem_dev_l = device_find_child(&dev->plat_dev->dev, "s5p-mfc-l",
@ -1009,20 +995,20 @@ static int s5p_mfc_probe(struct platform_device *pdev)
if (!dev->mem_dev_l) { if (!dev->mem_dev_l) {
mfc_err("Mem child (L) device get failed\n"); mfc_err("Mem child (L) device get failed\n");
ret = -ENODEV; ret = -ENODEV;
goto err_find_child; goto err_res;
} }
dev->mem_dev_r = device_find_child(&dev->plat_dev->dev, "s5p-mfc-r", dev->mem_dev_r = device_find_child(&dev->plat_dev->dev, "s5p-mfc-r",
match_child); match_child);
if (!dev->mem_dev_r) { if (!dev->mem_dev_r) {
mfc_err("Mem child (R) device get failed\n"); mfc_err("Mem child (R) device get failed\n");
ret = -ENODEV; ret = -ENODEV;
goto err_find_child; goto err_res;
} }
dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l); dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l);
if (IS_ERR_OR_NULL(dev->alloc_ctx[0])) { if (IS_ERR_OR_NULL(dev->alloc_ctx[0])) {
ret = PTR_ERR(dev->alloc_ctx[0]); ret = PTR_ERR(dev->alloc_ctx[0]);
goto err_mem_init_ctx_0; goto err_res;
} }
dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r); dev->alloc_ctx[1] = vb2_dma_contig_init_ctx(dev->mem_dev_r);
if (IS_ERR_OR_NULL(dev->alloc_ctx[1])) { if (IS_ERR_OR_NULL(dev->alloc_ctx[1])) {
@ -1116,22 +1102,9 @@ static int s5p_mfc_probe(struct platform_device *pdev)
vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]);
err_mem_init_ctx_1: err_mem_init_ctx_1:
vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]);
err_mem_init_ctx_0:
err_find_child:
free_irq(dev->irq, dev);
err_req_irq:
err_get_res:
iounmap(dev->regs_base);
dev->regs_base = NULL;
err_ioremap:
release_resource(dev->mfc_mem);
kfree(dev->mfc_mem);
err_mem_reg:
err_res: err_res:
s5p_mfc_final_pm(dev); s5p_mfc_final_pm(dev);
err_clk:
err_dev:
kfree(dev);
pr_debug("%s-- with error\n", __func__); pr_debug("%s-- with error\n", __func__);
return ret; return ret;
@ -1154,15 +1127,7 @@ static int __devexit s5p_mfc_remove(struct platform_device *pdev)
vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[0]);
vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]); vb2_dma_contig_cleanup_ctx(dev->alloc_ctx[1]);
free_irq(dev->irq, dev);
iounmap(dev->regs_base);
if (dev->mfc_mem) {
release_resource(dev->mfc_mem);
kfree(dev->mfc_mem);
dev->mfc_mem = NULL;
}
s5p_mfc_final_pm(dev); s5p_mfc_final_pm(dev);
kfree(dev);
return 0; return 0;
} }

2
drivers/media/video/s5p-mfc/s5p_mfc_common.h
View file

@ -185,7 +185,6 @@ struct s5p_mfc_pm {
* @mem_dev_r: child device of the right memory bank (1) * @mem_dev_r: child device of the right memory bank (1)
* @regs_base: base address of the MFC hw registers * @regs_base: base address of the MFC hw registers
* @irq: irq resource * @irq: irq resource
* @mfc_mem: MFC registers memory resource
* @dec_ctrl_handler: control framework handler for decoding * @dec_ctrl_handler: control framework handler for decoding
* @enc_ctrl_handler: control framework handler for encoding * @enc_ctrl_handler: control framework handler for encoding
* @pm: power management control * @pm: power management control
@ -221,7 +220,6 @@ struct s5p_mfc_dev {
struct device *mem_dev_r; struct device *mem_dev_r;
void __iomem *regs_base; void __iomem *regs_base;
int irq; int irq;
struct resource *mfc_mem;
struct v4l2_ctrl_handler dec_ctrl_handler; struct v4l2_ctrl_handler dec_ctrl_handler;
struct v4l2_ctrl_handler enc_ctrl_handler; struct v4l2_ctrl_handler enc_ctrl_handler;
struct s5p_mfc_pm pm; struct s5p_mfc_pm pm;