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-fsl-cpm.c | |
| parent | 262a2f33454fcecdc2032ca84d6fecdb08233468 (diff) | |
| parent | fdeae8f5a2e5eb3fcc9c295bfb28503c3abd4d6e (diff) | |
Merge branch 'spi-5.4' into spi-next
Diffstat (limited to 'drivers/spi/spi-fsl-cpm.c')
| -rw-r--r-- | drivers/spi/spi-fsl-cpm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c index e967ac564761..858f0544289e 100644 --- a/drivers/spi/spi-fsl-cpm.c +++ b/drivers/spi/spi-fsl-cpm.c @@ -305,12 +305,10 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) } if (mspi->flags & SPI_CPM1) { - struct resource *res; void *pram; - res = platform_get_resource(to_platform_device(dev), - IORESOURCE_MEM, 1); - pram = devm_ioremap_resource(dev, res); + pram = devm_platform_ioremap_resource(to_platform_device(dev), + 1); if (IS_ERR(pram)) mspi->pram = NULL; else |