Commit 6df3d3aa authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

usb: fotg210: Switch to use dev_err_probe()

Switch to use dev_err_probe() to simplify the error paths and
unify message template.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230120154437.22025-4-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a426eb4
...@@ -50,10 +50,8 @@ static int fotg210_gemini_init(struct fotg210 *fotg, struct resource *res, ...@@ -50,10 +50,8 @@ static int fotg210_gemini_init(struct fotg210 *fotg, struct resource *res,
int ret; int ret;
map = syscon_regmap_lookup_by_phandle(np, "syscon"); map = syscon_regmap_lookup_by_phandle(np, "syscon");
if (IS_ERR(map)) { if (IS_ERR(map))
dev_err(dev, "no syscon\n"); return dev_err_probe(dev, PTR_ERR(map), "no syscon\n");
return PTR_ERR(map);
}
fotg->map = map; fotg->map = map;
wakeup = of_property_read_bool(np, "wakeup-source"); wakeup = of_property_read_bool(np, "wakeup-source");
......
...@@ -5575,8 +5575,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg) ...@@ -5575,8 +5575,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg)
hcd = usb_create_hcd(&fotg210_fotg210_hc_driver, dev, hcd = usb_create_hcd(&fotg210_fotg210_hc_driver, dev,
dev_name(dev)); dev_name(dev));
if (!hcd) { if (!hcd) {
dev_err(dev, "failed to create hcd\n"); retval = dev_err_probe(dev, -ENOMEM, "failed to create hcd\n");
retval = -ENOMEM;
goto fail_create_hcd; goto fail_create_hcd;
} }
...@@ -5600,7 +5599,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg) ...@@ -5600,7 +5599,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg)
retval = usb_add_hcd(hcd, irq, IRQF_SHARED); retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval) { 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; goto failed_put_hcd;
} }
device_wakeup_enable(hcd->self.controller); device_wakeup_enable(hcd->self.controller);
...@@ -5611,8 +5610,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg) ...@@ -5611,8 +5610,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg)
failed_put_hcd: failed_put_hcd:
usb_put_hcd(hcd); usb_put_hcd(hcd);
fail_create_hcd: fail_create_hcd:
dev_err(dev, "init %s fail, %d\n", dev_name(dev), retval); return dev_err_probe(dev, retval, "init %s fail\n", dev_name(dev));
return retval;
} }
/* /*
......
...@@ -1271,7 +1271,7 @@ int fotg210_udc_probe(struct platform_device *pdev, struct fotg210 *fotg) ...@@ -1271,7 +1271,7 @@ int fotg210_udc_probe(struct platform_device *pdev, struct fotg210 *fotg)
ret = request_irq(irq, fotg210_irq, IRQF_SHARED, ret = request_irq(irq, fotg210_irq, IRQF_SHARED,
udc_name, fotg210); udc_name, fotg210);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "request_irq error (%d)\n", ret); dev_err_probe(dev, ret, "request_irq error\n");
goto err_req; goto err_req;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment