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

[media] media: davinci: vpif: Convert to devm_* api 

Use devm_ioremap_resource instead of reques_mem_region()/ioremap().
This ensures more consistent error values and simplifies error paths.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Lad, Prabhakar 2013-06-17 11:20:42 -03:00 committed by Mauro Carvalho Chehab
parent 01105690c4
commit c7f808d19d
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/platform/davinci/vpif.c
View File

@ -37,8 +37,6 @@ MODULE_LICENSE("GPL");
#define VPIF_CH2_MAX_MODES (15) #define VPIF_CH2_MAX_MODES (15)
#define VPIF_CH3_MAX_MODES (02) #define VPIF_CH3_MAX_MODES (02)
static resource_size_t res_len;
static struct resource *res;
spinlock_t vpif_lock; spinlock_t vpif_lock;
void __iomem *vpif_base; void __iomem *vpif_base;
@ -421,23 +419,12 @@ EXPORT_SYMBOL(vpif_channel_getfid);
static int vpif_probe(struct platform_device *pdev) static int vpif_probe(struct platform_device *pdev)
{ {
int status = 0; static struct resource *res;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) vpif_base = devm_ioremap_resource(&pdev->dev, res);
return -ENOENT; if (IS_ERR(vpif_base))
return PTR_ERR(vpif_base);
res_len = resource_size(res);
res = request_mem_region(res->start, res_len, res->name);
if (!res)
return -EBUSY;
vpif_base = ioremap(res->start, res_len);
if (!vpif_base) {
status = -EBUSY;
goto fail;
}
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
pm_runtime_get(&pdev->dev); pm_runtime_get(&pdev->dev);
@ -445,17 +432,11 @@ static int vpif_probe(struct platform_device *pdev)
spin_lock_init(&vpif_lock); spin_lock_init(&vpif_lock);
dev_info(&pdev->dev, "vpif probe success\n"); dev_info(&pdev->dev, "vpif probe success\n");
return 0; return 0;
fail:
release_mem_region(res->start, res_len);
return status;
} }
static int vpif_remove(struct platform_device *pdev) static int vpif_remove(struct platform_device *pdev)
{ {
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
iounmap(vpif_base);
release_mem_region(res->start, res_len);
return 0; return 0;
} }