2024-02-04 09:25:33

by Markus Elfring

[permalink] [raw]
Subject: [PATCH] spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe()

From: Markus Elfring <[email protected]>
Date: Sun, 4 Feb 2024 09:39:48 +0100

The devm_ioremap() function does not return error pointers.
It returns NULL on error.
This issue was detected once more also by using the Coccinelle software.

Update three checks (and corresponding error codes) for failed
function calls accordingly.

Fixes: ffdfbafdc4f4 ("spmi: Use devm_spmi_controller_alloc()")
Fixes: 231601cd22bd ("spmi: pmic-arb: Add support for PMIC v7")
Signed-off-by: Markus Elfring <[email protected]>
---

See also:
Suggestion by Peng Wu
[PATCH -next] spmi: pmic-arb: fix a NULL vs IS_ERR() check in spmi_pmic_arb_probe()
https://lore.kernel.org/lkml/[email protected]/
https://lkml.org/lkml/2022/11/15/197


drivers/spmi/spmi-pmic-arb.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index 9ed1180fe31f..937c15324513 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -1462,8 +1462,8 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
*/
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
core = devm_ioremap(&ctrl->dev, res->start, resource_size(res));
- if (IS_ERR(core))
- return PTR_ERR(core);
+ if (!core)
+ return -ENOMEM;

pmic_arb->core_size = resource_size(res);

@@ -1495,15 +1495,15 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
"obsrvr");
pmic_arb->rd_base = devm_ioremap(&ctrl->dev, res->start,
resource_size(res));
- if (IS_ERR(pmic_arb->rd_base))
- return PTR_ERR(pmic_arb->rd_base);
+ if (!pmic_arb->rd_base)
+ return -ENOMEM;

res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"chnls");
pmic_arb->wr_base = devm_ioremap(&ctrl->dev, res->start,
resource_size(res));
- if (IS_ERR(pmic_arb->wr_base))
- return PTR_ERR(pmic_arb->wr_base);
+ if (!pmic_arb->wr_base)
+ return -ENOMEM;
}

pmic_arb->max_periphs = PMIC_ARB_MAX_PERIPHS;
--
2.43.0



2024-02-04 09:28:09

by Dmitry Baryshkov

[permalink] [raw]
Subject: Re: [PATCH] spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe()

On Sun, 4 Feb 2024 at 10:24, Markus Elfring <[email protected]> wrote:
>
> From: Markus Elfring <[email protected]>
> Date: Sun, 4 Feb 2024 09:39:48 +0100
>
> The devm_ioremap() function does not return error pointers.
> It returns NULL on error.
> This issue was detected once more also by using the Coccinelle software.
>
> Update three checks (and corresponding error codes) for failed
> function calls accordingly.
>
> Fixes: ffdfbafdc4f4 ("spmi: Use devm_spmi_controller_alloc()")
> Fixes: 231601cd22bd ("spmi: pmic-arb: Add support for PMIC v7")
> Signed-off-by: Markus Elfring <[email protected]>
> ---
>
> See also:
> Suggestion by Peng Wu
> [PATCH -next] spmi: pmic-arb: fix a NULL vs IS_ERR() check in spmi_pmic_arb_probe()
> https://lore.kernel.org/lkml/[email protected]/
> https://lkml.org/lkml/2022/11/15/197
>

Reviewed-by: Dmitry Baryshkov <[email protected]>

--
With best wishes
Dmitry

2024-02-05 23:44:26

by David Collins

[permalink] [raw]
Subject: Re: [PATCH] spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe()

On 2/4/24 01:24, Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Sun, 4 Feb 2024 09:39:48 +0100
>
> The devm_ioremap() function does not return error pointers.
> It returns NULL on error.
> This issue was detected once more also by using the Coccinelle software.
>
> Update three checks (and corresponding error codes) for failed
> function calls accordingly.
>
> Fixes: ffdfbafdc4f4 ("spmi: Use devm_spmi_controller_alloc()")
> Fixes: 231601cd22bd ("spmi: pmic-arb: Add support for PMIC v7")
> Signed-off-by: Markus Elfring <[email protected]>
> ---
>
> See also:
> Suggestion by Peng Wu
> [PATCH -next] spmi: pmic-arb: fix a NULL vs IS_ERR() check in spmi_pmic_arb_probe()
> https://lore.kernel.org/lkml/[email protected]/
> https://lkml.org/lkml/2022/11/15/197
>
>
> drivers/spmi/spmi-pmic-arb.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: David Collins <[email protected]>

Thanks for making this fix.

Take care,
David


Subject: Re: [PATCH] spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe()

Il 04/02/24 10:24, Markus Elfring ha scritto:
> From: Markus Elfring <[email protected]>
> Date: Sun, 4 Feb 2024 09:39:48 +0100
>
> The devm_ioremap() function does not return error pointers.
> It returns NULL on error.
> This issue was detected once more also by using the Coccinelle software.
>
> Update three checks (and corresponding error codes) for failed
> function calls accordingly.
>
> Fixes: ffdfbafdc4f4 ("spmi: Use devm_spmi_controller_alloc()")
> Fixes: 231601cd22bd ("spmi: pmic-arb: Add support for PMIC v7")
> Signed-off-by: Markus Elfring <[email protected]>

Reviewed-by: AngeloGioacchino Del Regno <[email protected]>



2024-04-08 03:30:41

by Stephen Boyd

[permalink] [raw]
Subject: Re: [PATCH] spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe()

Quoting Markus Elfring (2024-02-04 01:24:18)
> From: Markus Elfring <[email protected]>
> Date: Sun, 4 Feb 2024 09:39:48 +0100
>
> The devm_ioremap() function does not return error pointers.
> It returns NULL on error.
> This issue was detected once more also by using the Coccinelle software.
>
> Update three checks (and corresponding error codes) for failed
> function calls accordingly.
>
> Fixes: ffdfbafdc4f4 ("spmi: Use devm_spmi_controller_alloc()")
> Fixes: 231601cd22bd ("spmi: pmic-arb: Add support for PMIC v7")
> Signed-off-by: Markus Elfring <[email protected]>
> ---

Applied to spmi-next