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

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
...@@ -175,6 +175,7 @@ static int octeon_spi_transfer_one_message(struct spi_master *master, ...@@ -175,6 +175,7 @@ static int octeon_spi_transfer_one_message(struct spi_master *master,
static int octeon_spi_probe(struct platform_device *pdev) static int octeon_spi_probe(struct platform_device *pdev)
{ {
struct resource *res_mem; struct resource *res_mem;
void __iomem *reg_base;
struct spi_master *master; struct spi_master *master;
struct octeon_spi *p; struct octeon_spi *p;
int err = -ENOENT; int err = -ENOENT;
...@@ -186,19 +187,13 @@ static int octeon_spi_probe(struct platform_device *pdev) ...@@ -186,19 +187,13 @@ static int octeon_spi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, master);
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
reg_base = devm_ioremap_resource(&pdev->dev, res_mem);
if (res_mem == NULL) { if (IS_ERR(reg_base)) {
dev_err(&pdev->dev, "found no memory resource\n"); err = PTR_ERR(reg_base);
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");
goto fail; 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->num_chipselect = 4;
master->mode_bits = SPI_CPHA | master->mode_bits = SPI_CPHA |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment