power: reset: xgene-reboot: Fix a NULL vs IS_ERR() test

Message ID fe1b90d0-7234-4e03-accc-69a119f6a7eb@moroto.mountain
State New
Headers
Series power: reset: xgene-reboot: Fix a NULL vs IS_ERR() test |

Commit Message

Dan Carpenter Feb. 20, 2024, 9:02 a.m. UTC
  The devm_platform_ioremap_resource() function returns error points.  It
never returns NULL.  Update the check accordingly.

Fixes: 7ddfd33c6ee5 ("power: reset: xgene-reboot: Use devm_platform_ioremap_resource() helper")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/power/reset/xgene-reboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Andrew Davis Feb. 20, 2024, 1:55 p.m. UTC | #1
On 2/20/24 3:02 AM, Dan Carpenter wrote:
> The devm_platform_ioremap_resource() function returns error points.  It
> never returns NULL.  Update the check accordingly.
> 
> Fixes: 7ddfd33c6ee5 ("power: reset: xgene-reboot: Use devm_platform_ioremap_resource() helper")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---

Acked-by: Andrew Davis <afd@ti.com>

>   drivers/power/reset/xgene-reboot.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
> index 867162dfe7ea..b5eee19bac42 100644
> --- a/drivers/power/reset/xgene-reboot.c
> +++ b/drivers/power/reset/xgene-reboot.c
> @@ -51,9 +51,9 @@ static int xgene_reboot_probe(struct platform_device *pdev)
>   		return -ENOMEM;
>   
>   	ctx->csr = devm_platform_ioremap_resource(pdev, 0);
> -	if (!ctx->csr) {
> +	if (IS_ERR(ctx->csr)) {
>   		dev_err(dev, "can not map resource\n");
> -		return -ENODEV;
> +		return PTR_ERR(ctx->csr);
>   	}
>   
>   	if (of_property_read_u32(dev->of_node, "mask", &ctx->mask))
  
Sebastian Reichel Feb. 21, 2024, 11:05 p.m. UTC | #2
On Tue, 20 Feb 2024 12:02:22 +0300, Dan Carpenter wrote:
> The devm_platform_ioremap_resource() function returns error points.  It
> never returns NULL.  Update the check accordingly.
> 
> 

Applied, thanks!

[1/1] power: reset: xgene-reboot: Fix a NULL vs IS_ERR() test
      commit: 62f4b33bf2b966035420c3e211bfa37f697c4d1f

Best regards,
  

Patch

diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
index 867162dfe7ea..b5eee19bac42 100644
--- a/drivers/power/reset/xgene-reboot.c
+++ b/drivers/power/reset/xgene-reboot.c
@@ -51,9 +51,9 @@  static int xgene_reboot_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	ctx->csr = devm_platform_ioremap_resource(pdev, 0);
-	if (!ctx->csr) {
+	if (IS_ERR(ctx->csr)) {
 		dev_err(dev, "can not map resource\n");
-		return -ENODEV;
+		return PTR_ERR(ctx->csr);
 	}
 
 	if (of_property_read_u32(dev->of_node, "mask", &ctx->mask))