diff mbox

Applied "spi: pic32: Fix checking return value of devm_ioremap_resource" to the spi tree

Message ID E1aw6gx-0004C3-5D@debutante (mailing list archive)
State Not Applicable
Headers show

Commit Message

Mark Brown April 29, 2016, 11:34 a.m. UTC 
The patch

   spi: pic32: Fix checking return value of devm_ioremap_resource

has been applied to the spi tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 866e48b0994c6338e6aa4ae7c413b5888ab432d1 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Wed, 27 Apr 2016 16:19:26 +0800
Subject: [PATCH] spi: pic32: Fix checking return value of
 devm_ioremap_resource

devm_ioremap_resource() returns ERR_PTR on error.
Also remove the redundant dev_err message, the implementation of
devm_ioremap_resource() already print error messages on error paths.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-pic32.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c
index 4eeb8a85b030..73db87f805a1 100644
--- a/drivers/spi/spi-pic32.c
+++ b/drivers/spi/spi-pic32.c
@@ -711,10 +711,9 @@  static int pic32_spi_hw_probe(struct platform_device *pdev,
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	pic32s->regs = devm_ioremap_resource(&pdev->dev, mem);
-	if (!pic32s->regs) {
-		dev_err(&pdev->dev, "ioremap() failed\n");
-		return -ENOMEM;
-	}
+	if (IS_ERR(pic32s->regs))
+		return PTR_ERR(pic32s->regs);
+
 	pic32s->dma_base = mem->start;
 
 	/* get irq resources: err-irq, rx-irq, tx-irq */