Skip to content

Commit c86f90e

Browse files
elfringgregkh
authored andcommitted
spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe()
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: ffdfbaf ("spmi: Use devm_spmi_controller_alloc()") Fixes: 231601c ("spmi: pmic-arb: Add support for PMIC v7") Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Link: https://lore.kernel.org/r/82a0768e-95b0-4091-bdd1-14c3e893726b@web.de Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: David Collins <quic_collinsd@quicinc.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org> Link: https://lore.kernel.org/r/20240507210809.3479953-6-sboyd@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent eda4923 commit c86f90e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/spmi/spmi-pmic-arb.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,8 +1462,8 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
14621462
*/
14631463
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
14641464
core = devm_ioremap(&ctrl->dev, res->start, resource_size(res));
1465-
if (IS_ERR(core))
1466-
return PTR_ERR(core);
1465+
if (!core)
1466+
return -ENOMEM;
14671467

14681468
pmic_arb->core_size = resource_size(res);
14691469

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

15011501
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
15021502
"chnls");
15031503
pmic_arb->wr_base = devm_ioremap(&ctrl->dev, res->start,
15041504
resource_size(res));
1505-
if (IS_ERR(pmic_arb->wr_base))
1506-
return PTR_ERR(pmic_arb->wr_base);
1505+
if (!pmic_arb->wr_base)
1506+
return -ENOMEM;
15071507
}
15081508

15091509
pmic_arb->max_periphs = PMIC_ARB_MAX_PERIPHS;

0 commit comments

Comments
 (0)