soc: qcom: smsm: Use dev_err_probe()
authorYe Xingchen <ye.xingchen@zte.com.cn>
Fri, 24 Mar 2023 02:18:53 +0000 (10:18 +0800)
committerBjorn Andersson <andersson@kernel.org>
Fri, 24 Mar 2023 12:59:07 +0000 (05:59 -0700)
Replace the open-code with dev_err_probe() to simplify the code.

Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/202303241018532824420@zte.com.cn
drivers/soc/qcom/smsm.c

index 8c137df..c58cfff 100644 (file)
@@ -452,11 +452,10 @@ static int smsm_get_size_info(struct qcom_smsm *smsm)
        } *info;
 
        info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SIZE_INFO, &size);
-       if (IS_ERR(info) && PTR_ERR(info) != -ENOENT) {
-               if (PTR_ERR(info) != -EPROBE_DEFER)
-                       dev_err(smsm->dev, "unable to retrieve smsm size info\n");
-               return PTR_ERR(info);
-       } else if (IS_ERR(info) || size != sizeof(*info)) {
+       if (IS_ERR(info) && PTR_ERR(info) != -ENOENT)
+               return dev_err_probe(smsm->dev, PTR_ERR(info),
+                                    "unable to retrieve smsm size info\n");
+       else if (IS_ERR(info) || size != sizeof(*info)) {
                dev_warn(smsm->dev, "no smsm size info, using defaults\n");
                smsm->num_entries = SMSM_DEFAULT_NUM_ENTRIES;
                smsm->num_hosts = SMSM_DEFAULT_NUM_HOSTS;