From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Navet Subject: [PATCH] drivers: spi: bmc2835: use devm_ioremap_resource() Date: Thu, 2 May 2013 14:13:30 +0200 Message-ID: <1367496810-5400-1-git-send-email-laurent.navet@gmail.com> Cc: linux-rpi-kernel@lists.infradead.org, spi-devel-general@lists.sourceforge.net, linux-kernel@vger.kernel.org, Laurent Navet To: swarren@wwwdotorg.org, broonie@kernel.org, grant.likely@linaro.org Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-spi.vger.kernel.org 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 --- drivers/spi/spi-bcm2835.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 89c0b50..a4185e4 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; } -- 1.7.10.4