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

Commit b1ec4308 authored by Mark Brown's avatar Mark Brown Committed by Kukjin Kim
Browse files

spi/s3c64xx: Convert to devm_request_and_ioremap() 



Saves some error handling and a small amount of code.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 707214d0

drivers/spi/spi-s3c64xx.c

+1 −17
Original line number Diff line number Diff line
@@ -1280,14 +1280,7 @@ 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;



	if (request_mem_region(mem_res->start,

			resource_size(mem_res), pdev->name) == NULL) {

		dev_err(&pdev->dev, "Req mem region failed\n");

		ret = -ENXIO;

		goto err0;

	}



	sdd->regs = ioremap(mem_res->start, resource_size(mem_res));

	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;
@@ -1381,9 +1374,7 @@ err3: 
	if (!sdd->cntrlr_info->cfg_gpio && pdev->dev.of_node)

		s3c64xx_spi_dt_gpio_free(sdd);

err2:

	iounmap((void *) sdd->regs);

err1:

	release_mem_region(mem_res->start, resource_size(mem_res));

err0:

	platform_set_drvdata(pdev, NULL);

	spi_master_put(master);
@@ -1395,7 +1386,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev) 
{

	struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));

	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);

	struct resource	*mem_res;



	pm_runtime_disable(&pdev->dev);
@@ -1414,12 +1404,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev) 
	if (!sdd->cntrlr_info->cfg_gpio && pdev->dev.of_node)

		s3c64xx_spi_dt_gpio_free(sdd);



	iounmap((void *) sdd->regs);



	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (mem_res != NULL)

		release_mem_region(mem_res->start, resource_size(mem_res));



	platform_set_drvdata(pdev, NULL);

	spi_master_put(master);