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

Commit d65e8e4a authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

media: Convert to devm_ioremap_resource() 



Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc5e6dea

drivers/media/platform/exynos-gsc/gsc-core.c

+3 −5
Original line number Diff line number Diff line
@@ -1098,11 +1098,9 @@ static int gsc_probe(struct platform_device *pdev) 
	mutex_init(&gsc->lock);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	gsc->regs = devm_request_and_ioremap(dev, res);

	if (!gsc->regs) {

		dev_err(dev, "failed to map registers\n");

		return -ENOENT;

	}

	gsc->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(gsc->regs))

		return PTR_ERR(gsc->regs);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

drivers/media/platform/mx2_emmaprp.c

+3 −3
Original line number Diff line number Diff line
@@ -941,9 +941,9 @@ static int emmaprp_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, pcdev);



	pcdev->base_emma = devm_request_and_ioremap(&pdev->dev, res_emma);

	if (!pcdev->base_emma) {

		ret = -ENXIO;

	pcdev->base_emma = devm_ioremap_resource(&pdev->dev, res_emma);

	if (IS_ERR(pcdev->base_emma)) {

		ret = PTR_ERR(pcdev->base_emma);

		goto rel_vdev;

	}

drivers/media/platform/s3c-camif/camif-core.c

+3 −5
Original line number Diff line number Diff line
@@ -433,11 +433,9 @@ static int s3c_camif_probe(struct platform_device *pdev) 


	mres = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	camif->io_base = devm_request_and_ioremap(dev, mres);

	if (!camif->io_base) {

		dev_err(dev, "failed to obtain I/O memory\n");

		return -ENOENT;

	}

	camif->io_base = devm_ioremap_resource(dev, mres);

	if (IS_ERR(camif->io_base))

		return PTR_ERR(camif->io_base);



	ret = camif_request_irqs(pdev, camif);

	if (ret < 0)

drivers/media/platform/s5p-fimc/fimc-core.c

+3 −5
Original line number Diff line number Diff line
@@ -909,11 +909,9 @@ static int fimc_probe(struct platform_device *pdev) 
	mutex_init(&fimc->lock);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	fimc->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (fimc->regs == NULL) {

		dev_err(&pdev->dev, "Failed to obtain io memory\n");

		return -ENOENT;

	}

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

	if (IS_ERR(fimc->regs))

		return PTR_ERR(fimc->regs);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (res == NULL) {

drivers/media/platform/s5p-fimc/fimc-lite.c

+3 −5
Original line number Diff line number Diff line
@@ -1426,11 +1426,9 @@ static int fimc_lite_probe(struct platform_device *pdev) 
	mutex_init(&fimc->lock);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	fimc->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (fimc->regs == NULL) {

		dev_err(&pdev->dev, "Failed to obtain io memory\n");

		return -ENOENT;

	}

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

	if (IS_ERR(fimc->regs))

		return PTR_ERR(fimc->regs);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (res == NULL) {