diff options
author | Mark Brown <broonie@kernel.org> | 2019-09-15 10:32:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-09-15 10:32:06 +0100 |
commit | b769c5ba8aedc395ed04abe6db84a556d28beec1 (patch) | |
tree | dd00c955f899f65785d60c2b4673785c28054b30 /drivers/spi/spi-sh-msiof.c | |
parent | 262a2f33454fcecdc2032ca84d6fecdb08233468 (diff) | |
parent | fdeae8f5a2e5eb3fcc9c295bfb28503c3abd4d6e (diff) | |
download | linux-b769c5ba8aedc395ed04abe6db84a556d28beec1.tar.bz2 |
Merge branch 'spi-5.4' into spi-next
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
-rw-r--r-- | drivers/spi/spi-sh-msiof.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index b50bdbc27e58..8f134735291f 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1297,7 +1297,6 @@ static void sh_msiof_release_dma(struct sh_msiof_spi_priv *p) static int sh_msiof_spi_probe(struct platform_device *pdev) { - struct resource *r; struct spi_controller *ctlr; const struct sh_msiof_chipdata *chipdata; struct sh_msiof_spi_info *info; @@ -1346,13 +1345,11 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) i = platform_get_irq(pdev, 0); if (i < 0) { - dev_err(&pdev->dev, "cannot get IRQ\n"); ret = i; goto err1; } - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - p->mapbase = devm_ioremap_resource(&pdev->dev, r); + p->mapbase = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(p->mapbase)) { ret = PTR_ERR(p->mapbase); goto err1; |