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-mxs.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-mxs.c')
| -rw-r--r-- | drivers/spi/spi-mxs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index 7bf53cfc25d6..996c1c8a9c71 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -532,7 +532,6 @@ static int mxs_spi_probe(struct platform_device *pdev) struct spi_master *master; struct mxs_spi *spi; struct mxs_ssp *ssp; - struct resource *iores; struct clk *clk; void __iomem *base; int devid, clk_freq; @@ -545,12 +544,11 @@ static int mxs_spi_probe(struct platform_device *pdev) */ const int clk_freq_default = 160000000; - iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq_err = platform_get_irq(pdev, 0); if (irq_err < 0) return irq_err; - base = devm_ioremap_resource(&pdev->dev, iores); + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); |