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

Commit cbfd6a21 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

spi/pxa2xx: Convert to devm_ioremap_resource() 



Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() 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 avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f333a331

drivers/spi/spi-pxa2xx.c

+4 −5
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/device.h>

#include <linux/ioport.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/spi/pxa2xx_spi.h>
@@ -1088,11 +1089,9 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) 
	ssp = &pdata->ssp;



	ssp->phys_base = res->start;

	ssp->mmio_base = devm_request_and_ioremap(&pdev->dev, res);

	if (!ssp->mmio_base) {

		dev_err(&pdev->dev, "failed to ioremap mmio_base\n");

		return NULL;

	}

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

	if (IS_ERR(ssp->mmio_base))

		return PTR_ERR(ssp->mmio_base);



	ssp->clk = devm_clk_get(&pdev->dev, NULL);

	ssp->irq = platform_get_irq(pdev, 0);