diff options
| author | Laurent Navet <laurent.navet@gmail.com> | 2013-05-02 14:13:30 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-13 16:10:51 +0200 |
| commit | 2d6e75e894f355109d1f256cfdcfca9aafa90b9a (patch) | |
| tree | 577abcde99c505e5241771164cf50ee12f71217e /drivers | |
| parent | Linux 3.10-rc1 (diff) | |
| download | linux-2d6e75e894f355109d1f256cfdcfca9aafa90b9a.tar.xz linux-2d6e75e894f355109d1f256cfdcfca9aafa90b9a.zip | |
spi: bmc2835: use devm_ioremap_resource()
Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.
Found with coccicheck and this semantic patch:
scripts/coccinelle/api/devm_request_and_ioremap.cocci.
Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-bcm2835.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 89c0b5033114..a4185e492321 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -331,10 +331,9 @@ static int bcm2835_spi_probe(struct platform_device *pdev) goto out_master_put; } - bs->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!bs->regs) { - dev_err(&pdev->dev, "could not request/map memory region\n"); - err = -ENODEV; + bs->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(bs->regs)) { + err = PTR_ERR(bs->regs); goto out_master_put; } |