scsi: ufs: ufs-qcom: 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: Martin K. Petersen <martin.petersen@oracle.com> # UFS
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-5-2a595382185b@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index bc037db46624adaf494d08f6c2a2c55c9ed24606..9c0973a7ffc3aaaef4ba54e9b3420da2e30884a1 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -177,14 +177,14 @@ static int ufs_qcom_ice_init(struct ufs_qcom_host *host)
        int i;
 
        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);
-
        host->ice = ice;
 
        /* Initialize the blk_crypto_profile */