From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 4/5] usb: fotg210: Switch to use dev_err_probe()
Date: Fri, 20 Jan 2023 17:44:36 +0200 [thread overview]
Message-ID: <20230120154437.22025-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com>
Switch to use dev_err_probe() to simplify the error paths and
unify message template.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/usb/fotg210/fotg210-core.c | 6 ++----
drivers/usb/fotg210/fotg210-hcd.c | 8 +++-----
drivers/usb/fotg210/fotg210-udc.c | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/fotg210/fotg210-core.c b/drivers/usb/fotg210/fotg210-core.c
index c06f8eb3acbd..ce00d9407ce5 100644
--- a/drivers/usb/fotg210/fotg210-core.c
+++ b/drivers/usb/fotg210/fotg210-core.c
@@ -50,10 +50,8 @@ static int fotg210_gemini_init(struct fotg210 *fotg, struct resource *res,
int ret;
map = syscon_regmap_lookup_by_phandle(np, "syscon");
- if (IS_ERR(map)) {
- dev_err(dev, "no syscon\n");
- return PTR_ERR(map);
- }
+ if (IS_ERR(map))
+ return dev_err_probe(dev, PTR_ERR(map), "no syscon\n");
fotg->map = map;
wakeup = of_property_read_bool(np, "wakeup-source");
diff --git a/drivers/usb/fotg210/fotg210-hcd.c b/drivers/usb/fotg210/fotg210-hcd.c
index 5a934f5343a7..613d29f04bcb 100644
--- a/drivers/usb/fotg210/fotg210-hcd.c
+++ b/drivers/usb/fotg210/fotg210-hcd.c
@@ -5575,8 +5575,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg)
hcd = usb_create_hcd(&fotg210_fotg210_hc_driver, dev,
dev_name(dev));
if (!hcd) {
- dev_err(dev, "failed to create hcd\n");
- retval = -ENOMEM;
+ retval = dev_err_probe(dev, -ENOMEM, "failed to create hcd\n");
goto fail_create_hcd;
}
@@ -5600,7 +5599,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg)
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval) {
- dev_err(dev, "failed to add hcd with err %d\n", retval);
+ dev_err_probe(dev, retval, "failed to add hcd\n");
goto failed_put_hcd;
}
device_wakeup_enable(hcd->self.controller);
@@ -5611,8 +5610,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg)
failed_put_hcd:
usb_put_hcd(hcd);
fail_create_hcd:
- dev_err(dev, "init %s fail, %d\n", dev_name(dev), retval);
- return retval;
+ return dev_err_probe(dev, retval, "init %s fail\n", dev_name(dev));
}
/*
diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c
index 18d254125186..5b515f5cb2d7 100644
--- a/drivers/usb/fotg210/fotg210-udc.c
+++ b/drivers/usb/fotg210/fotg210-udc.c
@@ -1258,7 +1258,7 @@ int fotg210_udc_probe(struct platform_device *pdev, struct fotg210 *fotg)
ret = request_irq(irq, fotg210_irq, IRQF_SHARED,
udc_name, fotg210);
if (ret < 0) {
- dev_err(dev, "request_irq error (%d)\n", ret);
+ dev_err_probe(dev, ret, "request_irq error\n");
goto err_req;
}
--
2.39.0
next prev parent reply other threads:[~2023-01-20 15:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 15:44 [PATCH v1 1/5] usb: fotg210-hcd: use sysfs_emit() to instead of scnprintf() Andy Shevchenko
2023-01-20 15:44 ` [PATCH v1 2/5] usb: fotg210-hcd: Don't shadow error codes in store() Andy Shevchenko
2023-01-26 20:00 ` Linus Walleij
2023-01-20 15:44 ` [PATCH v1 3/5] usb: fotg210-udc: remove redundant error logging Andy Shevchenko
2023-01-26 20:01 ` Linus Walleij
2023-01-20 15:44 ` Andy Shevchenko [this message]
2023-01-26 20:01 ` [PATCH v1 4/5] usb: fotg210: Switch to use dev_err_probe() Linus Walleij
2023-02-16 8:07 ` Christophe JAILLET
2023-02-16 8:30 ` Linus Walleij
2023-01-20 15:44 ` [PATCH v1 5/5] usb: fotg210: use devm_platform_get_and_ioremap_resource() Andy Shevchenko
2023-01-26 20:02 ` Linus Walleij
2023-01-27 8:55 ` Andy Shevchenko
2023-01-27 9:10 ` Linus Walleij
2023-01-27 9:16 ` Andy Shevchenko
2023-01-26 19:59 ` [PATCH v1 1/5] usb: fotg210-hcd: use sysfs_emit() to instead of scnprintf() Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230120154437.22025-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).