Commit 23f8bd25 authored by Cai Huoqing's avatar Cai Huoqing Committed by Mauro Carvalho Chehab
Browse files

media: sunxi: 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: default avatarCai Huoqing <caihuoqing@baidu.com>
Acked-by: default avatarMaxime Ripard <maxime@cerno.tech>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 092c69b2

drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c

+1 −3
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static int sun4i_csi_probe(struct platform_device *pdev) 
	struct v4l2_subdev *subdev;

	struct video_device *vdev;

	struct sun4i_csi *csi;

	struct resource *res;

	int ret;

	int irq;
@@ -179,8 +178,7 @@ static int sun4i_csi_probe(struct platform_device *pdev) 
	media_device_init(&csi->mdev);

	csi->v4l.mdev = &csi->mdev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

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

	if (IS_ERR(csi->regs))

		return PTR_ERR(csi->regs);

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c

+1 −3
Original line number Diff line number Diff line
@@ -833,13 +833,11 @@ static const struct regmap_config sun6i_csi_regmap_config = { 
static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev,

				      struct platform_device *pdev)

{

	struct resource *res;

	void __iomem *io_base;

	int ret;

	int irq;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	io_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(io_base))

		return PTR_ERR(io_base);

drivers/media/platform/sunxi/sun8i-di/sun8i-di.c

+1 −3
Original line number Diff line number Diff line
@@ -803,7 +803,6 @@ static int deinterlace_probe(struct platform_device *pdev) 
{

	struct deinterlace_dev *dev;

	struct video_device *vfd;

	struct resource *res;

	int irq, ret;



	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
@@ -825,8 +824,7 @@ static int deinterlace_probe(struct platform_device *pdev) 
		return ret;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	dev->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dev->base))

		return PTR_ERR(dev->base);