mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

USB: dwc3: clean up probe error labels

Browse source 
Use descriptive names consistently for the probe error labels.

Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230404072524.19014-7-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2023-04-04 09:25:19 +02:00 committed by Greg Kroah-Hartman
parent f56d0d29b0
commit fe296046c7
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/usb/dwc3/core.c
View file

@ -1717,7 +1717,7 @@ static int dwc3_probe(struct platform_device *pdev)
dwc->reset = devm_reset_control_array_get_optional_shared(dev);
if (IS_ERR(dwc->reset)) {
ret = PTR_ERR(dwc->reset);
goto put_usb_psy;
goto err_put_psy;
}
if (dev->of_node) {
@ -1731,7 +1731,7 @@ static int dwc3_probe(struct platform_device *pdev)
if (IS_ERR(dwc->bus_clk)) {
ret = dev_err_probe(dev, PTR_ERR(dwc->bus_clk),
"could not get bus clock\n");
goto put_usb_psy;
goto err_put_psy;
}
if (dwc->bus_clk == NULL) {
@ -1739,7 +1739,7 @@ static int dwc3_probe(struct platform_device *pdev)
if (IS_ERR(dwc->bus_clk)) {
ret = dev_err_probe(dev, PTR_ERR(dwc->bus_clk),
"could not get bus clock\n");
goto put_usb_psy;
goto err_put_psy;
}
}
@ -1747,7 +1747,7 @@ static int dwc3_probe(struct platform_device *pdev)
if (IS_ERR(dwc->ref_clk)) {
ret = dev_err_probe(dev, PTR_ERR(dwc->ref_clk),
"could not get ref clock\n");
goto put_usb_psy;
goto err_put_psy;
}
if (dwc->ref_clk == NULL) {
@ -1755,7 +1755,7 @@ static int dwc3_probe(struct platform_device *pdev)
if (IS_ERR(dwc->ref_clk)) {
ret = dev_err_probe(dev, PTR_ERR(dwc->ref_clk),
"could not get ref clock\n");
goto put_usb_psy;
goto err_put_psy;
}
}
@ -1763,7 +1763,7 @@ static int dwc3_probe(struct platform_device *pdev)
if (IS_ERR(dwc->susp_clk)) {
ret = dev_err_probe(dev, PTR_ERR(dwc->susp_clk),
"could not get suspend clock\n");
goto put_usb_psy;
goto err_put_psy;
}
if (dwc->susp_clk == NULL) {
@ -1771,23 +1771,23 @@ static int dwc3_probe(struct platform_device *pdev)
if (IS_ERR(dwc->susp_clk)) {
ret = dev_err_probe(dev, PTR_ERR(dwc->susp_clk),
"could not get suspend clock\n");
goto put_usb_psy;
goto err_put_psy;
}
}
}
ret = reset_control_deassert(dwc->reset);
if (ret)
goto put_usb_psy;
goto err_put_psy;
ret = dwc3_clk_enable(dwc);
if (ret)
goto assert_reset;
goto err_assert_reset;
if (!dwc3_core_is_valid(dwc)) {
dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n");
ret = -ENODEV;
goto disable_clks;
goto err_disable_clks;
}
platform_set_drvdata(pdev, dwc);
@ -1797,7 +1797,7 @@ static int dwc3_probe(struct platform_device *pdev)
DWC3_GHWPARAMS0_AWIDTH(dwc->hwparams.hwparams0) == 64) {
ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));
if (ret)
goto disable_clks;
goto err_disable_clks;
}
spin_lock_init(&dwc->lock);
@ -1815,23 +1815,23 @@ static int dwc3_probe(struct platform_device *pdev)
if (ret) {
dev_err(dwc->dev, "failed to allocate event buffers\n");
ret = -ENOMEM;
goto err2;
goto err_allow_rpm;
}
dwc->edev = dwc3_get_extcon(dwc);
if (IS_ERR(dwc->edev)) {
ret = dev_err_probe(dwc->dev, PTR_ERR(dwc->edev), "failed to get extcon\n");
goto err3;
goto err_free_event_buffers;
}
ret = dwc3_get_dr_mode(dwc);
if (ret)
goto err3;
goto err_free_event_buffers;
ret = dwc3_core_init(dwc);
if (ret) {
dev_err_probe(dev, ret, "failed to initialize core\n");
goto err3;
goto err_free_event_buffers;
}
dwc3_check_params(dwc);
@ -1839,13 +1839,13 @@ static int dwc3_probe(struct platform_device *pdev)
ret = dwc3_core_init_mode(dwc);
if (ret)
goto err5;
goto err_exit_debugfs;
pm_runtime_put(dev);
return 0;
err5:
err_exit_debugfs:
dwc3_debugfs_exit(dwc);
dwc3_event_buffers_cleanup(dwc);
@ -1860,20 +1860,19 @@ static int dwc3_probe(struct platform_device *pdev)
phy_exit(dwc->usb3_generic_phy);
dwc3_ulpi_exit(dwc);
err3:
err_free_event_buffers:
dwc3_free_event_buffers(dwc);
err2:
err_allow_rpm:
pm_runtime_allow(dev);
pm_runtime_disable(dev);
pm_runtime_dont_use_autosuspend(dev);
pm_runtime_set_suspended(dev);
pm_runtime_put_noidle(dev);
disable_clks:
err_disable_clks:
dwc3_clk_disable(dwc);
assert_reset:
err_assert_reset:
reset_control_assert(dwc->reset);
put_usb_psy:
err_put_psy:
if (dwc->usb_psy)
power_supply_put(dwc->usb_psy);