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

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

spi: 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: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e2cbdf3c

drivers/spi/spi-ep93xx.c

+3 −4
Original line number Diff line number Diff line
@@ -1085,10 +1085,9 @@ static int ep93xx_spi_probe(struct platform_device *pdev) 


	espi->sspdr_phys = res->start + SSPDR;



	espi->regs_base = devm_request_and_ioremap(&pdev->dev, res);

	if (!espi->regs_base) {

		dev_err(&pdev->dev, "failed to map resources\n");

		error = -ENODEV;

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

	if (IS_ERR(espi->regs_base)) {

		error = PTR_ERR(espi->regs_base);

		goto fail_put_clock;

	}

drivers/spi/spi-mxs.c

+3 −3
Original line number Diff line number Diff line
@@ -538,9 +538,9 @@ static int mxs_spi_probe(struct platform_device *pdev) 
	if (!iores || irq_err < 0 || irq_dma < 0)

		return -EINVAL;



	base = devm_request_and_ioremap(&pdev->dev, iores);

	if (!base)

		return -EADDRNOTAVAIL;

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

	if (IS_ERR(base))

		return PTR_ERR(base);



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl))

drivers/spi/spi-omap2-mcspi.c

+3 −4
Original line number Diff line number Diff line
@@ -1204,10 +1204,9 @@ static int omap2_mcspi_probe(struct platform_device *pdev) 
	r->end += regs_offset;

	mcspi->phys = r->start;



	mcspi->base = devm_request_and_ioremap(&pdev->dev, r);

	if (!mcspi->base) {

		dev_dbg(&pdev->dev, "can't ioremap MCSPI\n");

		status = -ENOMEM;

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

	if (IS_ERR(mcspi->base)) {

		status = PTR_ERR(mcspi->base);

		goto free_master;

	}

drivers/spi/spi-s3c64xx.c

+3 −4
Original line number Diff line number Diff line
@@ -1276,10 +1276,9 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev) 
	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;



	sdd->regs = devm_request_and_ioremap(&pdev->dev, mem_res);

	if (sdd->regs == NULL) {

		dev_err(&pdev->dev, "Unable to remap IO\n");

		ret = -ENXIO;

	sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res);

	if (IS_ERR(sdd->regs)) {

		ret = PTR_ERR(sdd->regs);

		goto err1;

	}

drivers/spi/spi-sirf.c

+3 −4
Original line number Diff line number Diff line
@@ -535,10 +535,9 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) 
		}

	}



	sspi->base = devm_request_and_ioremap(&pdev->dev, mem_res);

	if (!sspi->base) {

		dev_err(&pdev->dev, "IO remap failed!\n");

		ret = -ENOMEM;

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

	if (IS_ERR(sspi->base)) {

		ret = PTR_ERR(sspi->base);

		goto free_master;

	}