Skip to contentSkip to conversation

remoteproc: qcom: wcnss: Fix return value check in wcnss_probe()

PATCH In review Wei Yongjun 2 participants 2 messages Aug 21, 2016 – Aug 23, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remoteproc: qcom: wcnss: Fix return value check in wcnss_probe()

From: Wei Yongjun <[email protected]>

In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

---
 drivers/remoteproc/qcom_wcnss.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/remoteproc/qcom_wcnss.c +2 -2
index 14c4585..1917de7 100644
@@ -528,8 +528,8 @@ static int wcnss_probe(struct platform_device *pdev)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pmu");
 	mmio = devm_ioremap_resource(&pdev->dev, res);
-	if (!mmio) {
-		ret = -ENOMEM;
+	if (IS_ERR(mmio)) {
+		ret = PTR_ERR(mmio);
 		goto free_rproc;
 	};
#1 lore raw
Quoted 7 lines · Wei Yongjun

From: Wei Yongjun <[email protected]>

In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Thanks Wei, applied to rproc-next.

Regards,
Bjorn

Quoted 19 lines
---
 drivers/remoteproc/qcom_wcnss.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/remoteproc/qcom_wcnss.c +2 -2
index 14c4585..1917de7 100644
@@ -528,8 +528,8 @@ static int wcnss_probe(struct platform_device *pdev)
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pmu");
 	mmio = devm_ioremap_resource(&pdev->dev, res);
-	if (!mmio) {
-		ret = -ENOMEM;
+	if (IS_ERR(mmio)) {
+		ret = PTR_ERR(mmio);
 		goto free_rproc;
 	};