Commit c86f90e3 authored by Markus Elfring's avatar Markus Elfring Committed by Greg Kroah-Hartman
Browse files

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: ffdfbafd ("spmi: Use devm_spmi_controller_alloc()")
Fixes: 231601cd ("spmi: pmic-arb: Add support for PMIC v7")
Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Link: https://lore.kernel.org/r/82a0768e-95b0-4091-bdd1-14c3e893726b@web.de


Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarDavid Collins <quic_collinsd@quicinc.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20240507210809.3479953-6-sboyd@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eda4923d

drivers/spmi/spmi-pmic-arb.c

+6 −6
Original line number Diff line number Diff line
@@ -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;