diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 11:32:06 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 11:32:06 +0200 |
| commit | b769c5ba8aedc395ed04abe6db84a556d28beec1 (patch) | |
| tree | dd00c955f899f65785d60c2b4673785c28054b30 /drivers/spi/spi-sun4i.c | |
| parent | Merge branch 'spi-5.3' into spi-linus (diff) | |
| parent | spi: mediatek: support large PA (diff) | |
| download | linux-b769c5ba8aedc395ed04abe6db84a556d28beec1.tar.xz linux-b769c5ba8aedc395ed04abe6db84a556d28beec1.zip | |
Merge branch 'spi-5.4' into spi-next
Diffstat (limited to 'drivers/spi/spi-sun4i.c')
| -rw-r--r-- | drivers/spi/spi-sun4i.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c index 5194bc07fd60..cbfac6596fad 100644 --- a/drivers/spi/spi-sun4i.c +++ b/drivers/spi/spi-sun4i.c @@ -428,7 +428,6 @@ static int sun4i_spi_probe(struct platform_device *pdev) { struct spi_master *master; struct sun4i_spi *sspi; - struct resource *res; int ret = 0, irq; master = spi_alloc_master(&pdev->dev, sizeof(struct sun4i_spi)); @@ -440,8 +439,7 @@ static int sun4i_spi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, master); sspi = spi_master_get_devdata(master); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - sspi->base_addr = devm_ioremap_resource(&pdev->dev, res); + sspi->base_addr = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(sspi->base_addr)) { ret = PTR_ERR(sspi->base_addr); goto err_free_master; @@ -449,7 +447,6 @@ static int sun4i_spi_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) { - dev_err(&pdev->dev, "No spi IRQ specified\n"); ret = -ENXIO; goto err_free_master; } |