usb: gadget: lpc32xx_udc: clean up probe error labels

Error labels should be named after what they do rather than after from
where they are jumped to.

Rename the probe error labels for consistency and to improve
readability.

Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Link: https://patch.msgid.link/20251218153519.19453-5-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c
index a962d4294fbec68cb3c164882d5463746c328b11..83c7e243dcf9d31f6cda082143d31068e8c0e17a 100644 (file)
--- a/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
@@ -3084,7 +3084,7 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
        if (!udc->udca_v_base) {
                dev_err(udc->dev, "error getting UDCA region\n");
                retval = -ENOMEM;
-               goto i2c_fail;
+               goto err_disable_clk;
        }
        udc->udca_p_base = dma_handle;
        dev_dbg(udc->dev, "DMA buffer(0x%x bytes), P:0x%08x, V:0x%p\n",
@@ -3097,7 +3097,7 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
        if (!udc->dd_cache) {
                dev_err(udc->dev, "error getting DD DMA region\n");
                retval = -ENOMEM;
-               goto dma_alloc_fail;
+               goto err_free_dma;
        }
 
        /* Clear USB peripheral and initialize gadget endpoints */
@@ -3111,14 +3111,14 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
        if (retval < 0) {
                dev_err(udc->dev, "LP request irq %d failed\n",
                        udc->udp_irq[IRQ_USB_LP]);
-               goto irq_req_fail;
+               goto err_destroy_pool;
        }
        retval = devm_request_irq(dev, udc->udp_irq[IRQ_USB_HP],
                                  lpc32xx_usb_hp_irq, 0, "udc_hp", udc);
        if (retval < 0) {
                dev_err(udc->dev, "HP request irq %d failed\n",
                        udc->udp_irq[IRQ_USB_HP]);
-               goto irq_req_fail;
+               goto err_destroy_pool;
        }
 
        retval = devm_request_irq(dev, udc->udp_irq[IRQ_USB_DEVDMA],
@@ -3126,7 +3126,7 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
        if (retval < 0) {
                dev_err(udc->dev, "DEV request irq %d failed\n",
                        udc->udp_irq[IRQ_USB_DEVDMA]);
-               goto irq_req_fail;
+               goto err_destroy_pool;
        }
 
        /* The transceiver interrupt is used for VBUS detection and will
@@ -3137,7 +3137,7 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
        if (retval < 0) {
                dev_err(udc->dev, "VBUS request irq %d failed\n",
                        udc->udp_irq[IRQ_USB_ATX]);
-               goto irq_req_fail;
+               goto err_destroy_pool;
        }
 
        /* Initialize wait queue */
@@ -3146,7 +3146,7 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
 
        retval = usb_add_gadget_udc(dev, &udc->gadget);
        if (retval < 0)
-               goto add_gadget_fail;
+               goto err_destroy_pool;
 
        dev_set_drvdata(dev, udc);
        device_init_wakeup(dev, 1);
@@ -3158,13 +3158,12 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
        dev_info(udc->dev, "%s version %s\n", driver_name, DRIVER_VERSION);
        return 0;
 
-add_gadget_fail:
-irq_req_fail:
+err_destroy_pool:
        dma_pool_destroy(udc->dd_cache);
-dma_alloc_fail:
+err_free_dma:
        dma_free_coherent(&pdev->dev, UDCA_BUFF_SIZE,
                          udc->udca_v_base, udc->udca_p_base);
-i2c_fail:
+err_disable_clk:
        clk_disable_unprepare(udc->usb_slv_clk);
 err_put_client:
        put_device(&udc->isp1301_i2c_client->dev);