mmc: sdhci-msm: Remove NULL check from devm_of_qcom_ice_get()

Now since the devm_of_qcom_ice_get() API never returns NULL, remove the
NULL check and also simplify the error handling.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Sumit Garg <sumit.garg@oss.qualcomm.com> # OP-TEE as TZ
Acked-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260518-qcom-ice-fix-v7-4-2a595382185b@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 633462c0be5f43c06c497520faf9f6fa03fa652a..0882ce74e0c9bdddd98341a67b97bcef74078e0c 100644 (file)
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -1918,14 +1918,14 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host,
                return 0;
 
        ice = devm_of_qcom_ice_get(dev);
-       if (ice == ERR_PTR(-EOPNOTSUPP)) {
+       if (IS_ERR(ice)) {
+               if (ice != ERR_PTR(-EOPNOTSUPP))
+                       return PTR_ERR(ice);
+
                dev_warn(dev, "Disabling inline encryption support\n");
-               ice = NULL;
+               return 0;
        }
 
-       if (IS_ERR_OR_NULL(ice))
-               return PTR_ERR_OR_ZERO(ice);
-
        msm_host->ice = ice;
 
        /* Initialize the blk_crypto_profile */