Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75b55a3c authored by Cai Huoqing's avatar Cai Huoqing Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 736cce12fa630e28705de06570d74f0513d948d5 ]

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

Signed-off-by: default avatarCai Huoqing <caihuoqing@baidu.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: c766c90faf93 ("media: rcar_fdp1: Fix refcount leak in probe and remove function")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 03d23445

drivers/media/platform/rcar_fdp1.c

+1 −3
Original line number Diff line number Diff line
@@ -2260,7 +2260,6 @@ static int fdp1_probe(struct platform_device *pdev) 
	struct fdp1_dev *fdp1;

	struct video_device *vfd;

	struct device_node *fcp_node;

	struct resource *res;

	struct clk *clk;

	unsigned int i;
@@ -2287,8 +2286,7 @@ static int fdp1_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, fdp1);



	/* Memory-mapped registers */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	fdp1->regs = devm_ioremap_resource(&pdev->dev, res);

	fdp1->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(fdp1->regs))

		return PTR_ERR(fdp1->regs);