summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYe Xingchen <ye.xingchen@zte.com.cn>2023-03-24 10:18:53 +0800
committerBjorn Andersson <andersson@kernel.org>2023-03-24 05:59:07 -0700
commit74f9d27ac7591e0df05c85ca5eb538253f39919d (patch)
tree22e0c521d8385cf5e905f294712c6236bfb81b34 /drivers
parentfb1eb0b5dcf6f214479e853ee466958190785ab4 (diff)
downloadlinux-stable-74f9d27ac7591e0df05c85ca5eb538253f39919d.tar.gz
linux-stable-74f9d27ac7591e0df05c85ca5eb538253f39919d.tar.bz2
linux-stable-74f9d27ac7591e0df05c85ca5eb538253f39919d.zip
soc: qcom: smsm: Use dev_err_probe()
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/soc/qcom/smsm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c
index 8c137dff7dac..c58cfff64856 100644
--- a/drivers/soc/qcom/smsm.c
+++ b/drivers/soc/qcom/smsm.c
@@ -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;