diff options
author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
commit | ca4196aa10087fe3ba3ce2383761898dc95b5e94 (patch) | |
tree | f870402f36377f3bde4b939da23dda18bc9bc862 /drivers/spi/spi-slave-mt27xx.c | |
parent | Merge branch 'spi-5.4' into spi-linus (diff) | |
parent | dt-bindings: spi: Convert stm32 QSPI bindings to json-schema (diff) | |
download | linux-dev-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.xz linux-dev-ca4196aa10087fe3ba3ce2383761898dc95b5e94.zip |
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'drivers/spi/spi-slave-mt27xx.c')
-rw-r--r-- | drivers/spi/spi-slave-mt27xx.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/spi/spi-slave-mt27xx.c b/drivers/spi/spi-slave-mt27xx.c index 61bc43b0fe57..44edaa360405 100644 --- a/drivers/spi/spi-slave-mt27xx.c +++ b/drivers/spi/spi-slave-mt27xx.c @@ -368,7 +368,6 @@ static int mtk_spi_slave_probe(struct platform_device *pdev) { struct spi_controller *ctlr; struct mtk_spi_slave *mdata; - struct resource *res; int irq, ret; ctlr = spi_alloc_slave(&pdev->dev, sizeof(*mdata)); @@ -392,17 +391,8 @@ static int mtk_spi_slave_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctlr); init_completion(&mdata->xfer_done); - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - ret = -ENODEV; - dev_err(&pdev->dev, "failed to determine base address\n"); - goto err_put_ctlr; - } - mdata->dev = &pdev->dev; - - mdata->base = devm_ioremap_resource(&pdev->dev, res); + mdata->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(mdata->base)) { ret = PTR_ERR(mdata->base); goto err_put_ctlr; |