From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9763E34A3C5; Mon, 23 Feb 2026 08:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771833776; cv=none; b=tevy00oXli5CChtIvuMURk1G5/osfvbB4EECV5Oi2Am+eyp+Oq88L5oIdDSVAeI4yIS0dD7mQiE4cbSN0PM96ZXAjhloIXm/ZMSwMzSCW9CtaIJvgtsxYQ8VXCstPO2QwPkK04pyaNu6degL9W8eWv68+i7sWidgCrTNYu/XiAQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771833776; c=relaxed/simple; bh=/bqXBQ6X2/4Wbft3E9J+vdGZscpAnCQFwDeFemvVOTM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DTW2ADH18uHAIErnPT1DND76NZZsr+jgwD9/Dhk2244rAn3KrdyQe3ytvAldH6Dl4+FED/ScWrLxVk2BeAOHBQY+0guw8Dt7U57ATM2KSYmhQ0kgNvmBH6pzKrZO6EVIqtrvBdCeMsZXacDLDLDZ+6mgA5Gq3NyohfYIjbkW2mI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=siFn+erX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="siFn+erX" Received: by smtp.kernel.org (Postfix) with ESMTPS id 61B61C2BC87; Mon, 23 Feb 2026 08:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771833776; bh=/bqXBQ6X2/4Wbft3E9J+vdGZscpAnCQFwDeFemvVOTM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=siFn+erX4+EO7QGEPhhFqBpQhN+ilKCG+SLWJLroQ7EV5+nUv5DFbsvFBs3mMRFV9 An/o8HkHNJWkuAhx3aWRoESOH+3AB1JR80JCesezAdaFFHrd1Ug6aP9zK2wyymvcat Ezgo943pKL2Qepmr5EWOz9en361cBR+5Tl1f2tDSRvuRtgLUmwGhaiWg2MHR8U5f0s WrzzC4cmo4/Zdr2QSxXRe0Alq01vRIRPNEiNGu0s3vguURIr4b9eKpg7A0GoyF0J6B JynT+Vy9OSCETm9jk26LGB7SaVv2w3re/BpAV574U/LhyygONJfe3lA2KTOUKJ6S0R v/szkXtff7Hrg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51ECBE98DFE; Mon, 23 Feb 2026 08:02:56 +0000 (UTC) From: Manivannan Sadhasivam via B4 Relay Date: Mon, 23 Feb 2026 13:32:53 +0530 Subject: [PATCH v3 2/4] soc: qcom: ice: Return proper error codes from devm_of_qcom_ice_get() instead of NULL Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260223-qcom-ice-fix-v3-2-6ca5846329f7@oss.qualcomm.com> References: <20260223-qcom-ice-fix-v3-0-6ca5846329f7@oss.qualcomm.com> In-Reply-To: <20260223-qcom-ice-fix-v3-0-6ca5846329f7@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Adrian Hunter , Ulf Hansson , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , Abel Vesa , Abel Vesa Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, Sumit Garg , mani@kernel.org, Manivannan Sadhasivam , Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2044; i=manivannan.sadhasivam@oss.qualcomm.com; h=from:subject:message-id; bh=qlNk1arg6N3q8uU2BM1qtGU1/GR24qZXlhSQO0jLcbY=; b=owEBbQGS/pANAwAKAVWfEeb+kc71AcsmYgBpnAmuu1ztiyDEx3ND4aeE2B76SyXPkYLBXs2HG k3p/VtOYZ+JATMEAAEKAB0WIQRnpUMqgUjL2KRYJ5dVnxHm/pHO9QUCaZwJrgAKCRBVnxHm/pHO 9bc3CACFMb8TuiJwyh0JBYeuj8kiYHYgT1910VZqQcfGKsiwgzB14CFkPg3SnwI3p6u2NdRjavP AVfsZgzEO7G3PDtNp6IAHSi6OT6bn5MYCSmB1r1t3rDICM5g6xalnroo4z6H6O7TU4qCuT9e2Gp hS/gGyIKP1z3TkjqVDMPw7W0Qjj0A2XkOPuIxy7435hiPp7OvTvqQ96Yo+M5NPsC7k7zb5A5ftC HRxMPnSSraKcXsPYYnevsuBMnHntqejcOzI1K6d3+tB9f5jIZPHmCxOhxtUm1iLETNtdPlAan1I NNgY6nAmr4JMRNjHlafhat4dJIDpdvpFB9fqNlDNANMesZ6N X-Developer-Key: i=manivannan.sadhasivam@oss.qualcomm.com; a=openpgp; fpr=C668AEC3C3188E4C611465E7488550E901166008 X-Endpoint-Received: by B4 Relay for manivannan.sadhasivam@oss.qualcomm.com/default with auth_id=461 X-Original-From: Manivannan Sadhasivam Reply-To: manivannan.sadhasivam@oss.qualcomm.com From: Manivannan Sadhasivam devm_of_qcom_ice_get() currently returns NULL if ICE SCM is not available or "qcom,ice" property is not found in DT. But this confuses the clients since NULL doesn't convey the reason for failure. So return proper error codes instead of NULL. Reported-by: Sumit Garg Reviewed-by: Konrad Dybcio Signed-off-by: Manivannan Sadhasivam --- drivers/soc/qcom/ice.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/soc/qcom/ice.c b/drivers/soc/qcom/ice.c index 3c3c189e24f9..1212b2481a04 100644 --- a/drivers/soc/qcom/ice.c +++ b/drivers/soc/qcom/ice.c @@ -562,7 +562,7 @@ static struct qcom_ice *qcom_ice_create(struct device *dev, if (!qcom_scm_ice_available()) { dev_warn(dev, "ICE SCM interface not found\n"); - return NULL; + return ERR_PTR(-EOPNOTSUPP); } engine = devm_kzalloc(dev, sizeof(*engine), GFP_KERNEL); @@ -657,7 +657,7 @@ static struct qcom_ice *of_qcom_ice_get(struct device *dev) struct device_node *node __free(device_node) = of_parse_phandle(dev->of_node, "qcom,ice", 0); if (!node) - return NULL; + return ERR_PTR(-ENODEV); pdev = of_find_device_by_node(node); if (!pdev) { @@ -701,8 +701,7 @@ static void devm_of_qcom_ice_put(struct device *dev, void *res) * phandle via 'qcom,ice' property to an ICE DT, the ICE instance will already * be created and so this function will return that instead. * - * Return: ICE pointer on success, NULL if there is no ICE data provided by the - * consumer or ERR_PTR() on error. + * Return: ICE pointer on success, ERR_PTR() on error. */ struct qcom_ice *devm_of_qcom_ice_get(struct device *dev) { @@ -713,7 +712,7 @@ struct qcom_ice *devm_of_qcom_ice_get(struct device *dev) return ERR_PTR(-ENOMEM); ice = of_qcom_ice_get(dev); - if (!IS_ERR_OR_NULL(ice)) { + if (!IS_ERR(ice)) { *dr = ice; devres_add(dev, dr); } else { -- 2.51.0