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-oc-tiny.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-oc-tiny.c')
-rw-r--r-- | drivers/spi/spi-oc-tiny.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c index bbc4ba66571f..e2331eb7b47a 100644 --- a/drivers/spi/spi-oc-tiny.c +++ b/drivers/spi/spi-oc-tiny.c @@ -240,7 +240,6 @@ static int tiny_spi_probe(struct platform_device *pdev) struct tiny_spi_platform_data *platp = dev_get_platdata(&pdev->dev); struct tiny_spi *hw; struct spi_master *master; - struct resource *res; unsigned int i; int err = -ENODEV; @@ -264,8 +263,7 @@ static int tiny_spi_probe(struct platform_device *pdev) hw->bitbang.txrx_bufs = tiny_spi_txrx_bufs; /* find and map our resources */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - hw->base = devm_ioremap_resource(&pdev->dev, res); + hw->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hw->base)) { err = PTR_ERR(hw->base); goto exit; |