From: Surendra Singh Chouhan <[email protected]>
cix_mbox_probe() logged property error messages referencing
"cix,mbox_dir" (with an underscore) instead of the actual DT property
string "cix,mbox-dir".
Fix the DT property string in error log messages and convert probe error
paths to dev_err_probe().
Signed-off-by: Surendra Singh Chouhan <[email protected]>
---
drivers/mailbox/cix-mailbox.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/mailbox/cix-mailbox.c b/drivers/mailbox/cix-mailbox.c
index 615218c69eeb..fb5d7641ba90 100644
--- a/drivers/mailbox/cix-mailbox.c
+++ b/drivers/mailbox/cix-mailbox.c
@@ -585,19 +585,15 @@ static int cix_mbox_probe(struct platform_device *pdev)
if (priv->irq < 0)
return priv->irq;
- if (device_property_read_string(dev, "cix,mbox-dir", &dir_str)) {
- dev_err(priv->dev, "cix,mbox_dir property not found\n");
- return -EINVAL;
- }
+ if (device_property_read_string(dev, "cix,mbox-dir", &dir_str))
+ return dev_err_probe(dev, -EINVAL, "cix,mbox-dir property not found\n");
if (!strcmp(dir_str, "tx"))
priv->dir = 0;
else if (!strcmp(dir_str, "rx"))
priv->dir = 1;
- else {
- dev_err(priv->dev, "cix,mbox_dir=%s is not expected\n", dir_str);
- return -EINVAL;
- }
+ else
+ return dev_err_probe(dev, -EINVAL, "cix,mbox-dir=%s is not expected\n", dir_str);
cix_mbox_init(priv);
@@ -611,9 +607,9 @@ static int cix_mbox_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv);
ret = devm_mbox_controller_register(dev, &priv->mbox);
if (ret)
- dev_err(dev, "Failed to register mailbox %d\n", ret);
+ return dev_err_probe(dev, ret, "Failed to register mailbox\n");
- return ret;
+ return 0;
}
static const struct of_device_id cix_mbox_dt_ids[] = {
--
2.55.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.