Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: davinci: Make use of the helper function devm_platform_ioremap_resource()

Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Cai Huoqing and committed by
Mauro Carvalho Chehab
bcbeade1 9caf7a0a

+6 -18
+2 -7
drivers/media/platform/davinci/vpbe_venc.c
··· 621 621 { 622 622 const struct platform_device_id *pdev_id; 623 623 struct venc_state *venc; 624 - struct resource *res; 625 624 626 625 if (!pdev->dev.platform_data) { 627 626 dev_err(&pdev->dev, "No platform data for VENC sub device"); ··· 639 640 venc->pdev = &pdev->dev; 640 641 venc->pdata = pdev->dev.platform_data; 641 642 642 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 643 - 644 - venc->venc_base = devm_ioremap_resource(&pdev->dev, res); 643 + venc->venc_base = devm_platform_ioremap_resource(pdev, 0); 645 644 if (IS_ERR(venc->venc_base)) 646 645 return PTR_ERR(venc->venc_base); 647 646 648 647 if (venc->venc_type != VPBE_VERSION_1) { 649 - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 650 - 651 - venc->vdaccfg_reg = devm_ioremap_resource(&pdev->dev, res); 648 + venc->vdaccfg_reg = devm_platform_ioremap_resource(pdev, 1); 652 649 if (IS_ERR(venc->vdaccfg_reg)) 653 650 return PTR_ERR(venc->vdaccfg_reg); 654 651 }
+2 -3
drivers/media/platform/davinci/vpif.c
··· 425 425 426 426 static int vpif_probe(struct platform_device *pdev) 427 427 { 428 - static struct resource *res, *res_irq; 428 + static struct resource *res_irq; 429 429 struct platform_device *pdev_capture, *pdev_display; 430 430 struct device_node *endpoint = NULL; 431 431 432 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 433 - vpif_base = devm_ioremap_resource(&pdev->dev, res); 432 + vpif_base = devm_platform_ioremap_resource(pdev, 0); 434 433 if (IS_ERR(vpif_base)) 435 434 return PTR_ERR(vpif_base); 436 435
+2 -8
drivers/media/platform/davinci/vpss.c
··· 392 392 393 393 static int vpss_probe(struct platform_device *pdev) 394 394 { 395 - struct resource *res; 396 395 char *platform_name; 397 396 398 397 if (!pdev->dev.platform_data) { ··· 412 413 } 413 414 414 415 dev_info(&pdev->dev, "%s vpss probed\n", platform_name); 415 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 416 - 417 - oper_cfg.vpss_regs_base0 = devm_ioremap_resource(&pdev->dev, res); 416 + oper_cfg.vpss_regs_base0 = devm_platform_ioremap_resource(pdev, 0); 418 417 if (IS_ERR(oper_cfg.vpss_regs_base0)) 419 418 return PTR_ERR(oper_cfg.vpss_regs_base0); 420 419 421 420 if (oper_cfg.platform == DM355 || oper_cfg.platform == DM365) { 422 - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 423 - 424 - oper_cfg.vpss_regs_base1 = devm_ioremap_resource(&pdev->dev, 425 - res); 421 + oper_cfg.vpss_regs_base1 = devm_platform_ioremap_resource(pdev, 1); 426 422 if (IS_ERR(oper_cfg.vpss_regs_base1)) 427 423 return PTR_ERR(oper_cfg.vpss_regs_base1); 428 424 }