Skip to contentSkip to conversation

spi: pic32: Fix checking return value of devm_ioremap_resource

PATCH In review Axel Lin 2 participants 2 messages Apr 27, 2016 – Apr 29, 2016 1 message not in the archive SPI

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/spi/spi-pic32.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/spi/spi-pic32.c +3 -4
index 4eeb8a8..73db87f 100644
@@ -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 */
Signature · 6 lines
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

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

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

Quoted 1 line

From 866e48b0994c6338e6aa4ae7c413b5888ab432d1 Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
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 <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 drivers/spi/spi-pic32.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/spi/spi-pic32.c +3 -4
index 4eeb8a85b030..73db87f805a1 100644
@@ -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 */
Signature · 6 lines
2.8.0.rc3

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html