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

Commit 3ae36c8b authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

spi: octeon: Convert to use devm_ioremap_resource 



Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c508709b

drivers/spi/spi-octeon.c

+6 −11
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ static int octeon_spi_transfer_one_message(struct spi_master *master, 
static int octeon_spi_probe(struct platform_device *pdev)

{

	struct resource *res_mem;

	void __iomem *reg_base;

	struct spi_master *master;

	struct octeon_spi *p;

	int err = -ENOENT;
@@ -186,19 +187,13 @@ static int octeon_spi_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, master);



	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	if (res_mem == NULL) {

		dev_err(&pdev->dev, "found no memory resource\n");

		err = -ENXIO;

		goto fail;

	}

	if (!devm_request_mem_region(&pdev->dev, res_mem->start,

				     resource_size(res_mem), res_mem->name)) {

		dev_err(&pdev->dev, "request_mem_region failed\n");

	reg_base = devm_ioremap_resource(&pdev->dev, res_mem);

	if (IS_ERR(reg_base)) {

		err = PTR_ERR(reg_base);

		goto fail;

	}

	p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start,

					     resource_size(res_mem));



	p->register_base = (u64)reg_base;



	master->num_chipselect = 4;

	master->mode_bits = SPI_CPHA |