[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250515203855146Sn9x-Uw9Teur35mOjn41C@zte.com.cn>
Date: Thu, 15 May 2025 20:38:55 +0800 (CST)
From: <long.yunjian@....com.cn>
To: <sudeep.holla@....com>
Cc: <cristian.marussi@....com>, <peng.fan@....com>, <justin.chen@...adcom.com>,
<florian.fainelli@...adcom.com>, <arm-scmi@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <linux-kernel@...r.kernel.org>,
<fang.yumeng@....com.cn>, <mou.yi@....com.cn>,
<ouyang.maochun@....com.cn>, <xu.lifeng1@....com.cn>
Subject: [PATCH] firmware: arm_scmi: Use dev_err_probe() simplify the code
From: Yumeng Fang <fang.yumeng@....com.cn>
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.
Signed-off-by: Yumeng Fang <fang.yumeng@....com.cn>
---
drivers/firmware/arm_scmi/transports/mailbox.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/firmware/arm_scmi/transports/mailbox.c b/drivers/firmware/arm_scmi/transports/mailbox.c
index bd041c99b92b..816e79537935 100644
--- a/drivers/firmware/arm_scmi/transports/mailbox.c
+++ b/drivers/firmware/arm_scmi/transports/mailbox.c
@@ -13,6 +13,7 @@
#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/dev_printk.h>
#include "../common.h"
@@ -215,10 +216,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
smbox->chan = mbox_request_channel(cl, tx ? 0 : p2a_chan);
if (IS_ERR(smbox->chan)) {
ret = PTR_ERR(smbox->chan);
- if (ret != -EPROBE_DEFER)
- dev_err(cdev,
- "failed to request SCMI %s mailbox\n", desc);
- return ret;
+ return dev_err_probe(cdev, ret,
+ "failed to request SCMI %s mailbox\n", desc);
}
/* Additional unidirectional channel for TX if needed */
@@ -226,9 +225,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
smbox->chan_receiver = mbox_request_channel(cl, a2p_rx_chan);
if (IS_ERR(smbox->chan_receiver)) {
ret = PTR_ERR(smbox->chan_receiver);
- if (ret != -EPROBE_DEFER)
- dev_err(cdev, "failed to request SCMI Tx Receiver mailbox\n");
- return ret;
+ return dev_err_probe(cdev, ret,
+ "failed to request SCMI Tx Receiver mailbox\n");
}
}
@@ -236,9 +234,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,
smbox->chan_platform_receiver = mbox_request_channel(cl, p2a_rx_chan);
if (IS_ERR(smbox->chan_platform_receiver)) {
ret = PTR_ERR(smbox->chan_platform_receiver);
- if (ret != -EPROBE_DEFER)
- dev_err(cdev, "failed to request SCMI P2A Receiver mailbox\n");
- return ret;
+ return dev_err_probe(cdev, ret,
+ "failed to request SCMI P2A Receiver mailbox\n");
}
}
--
2.25.1
Powered by blists - more mailing lists