Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: ehci-orion: rename error goto labels in ehci_orion_drv_probe()

In preparation to the introduction of additional initialization steps
in ehci_orion_drv_probe(), we rename the error goto labels from err1,
err2 and err3 names to some more meaningful names.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Thomas Petazzoni and committed by
Greg Kroah-Hartman
d8ea69e2 88bf6b3f

+9 -9
+9 -9
drivers/usb/host/ehci-orion.c
··· 160 160 "Found HC with no IRQ. Check %s setup!\n", 161 161 dev_name(&pdev->dev)); 162 162 err = -ENODEV; 163 - goto err1; 163 + goto err; 164 164 } 165 165 166 166 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ··· 169 169 "Found HC with no register addr. Check %s setup!\n", 170 170 dev_name(&pdev->dev)); 171 171 err = -ENODEV; 172 - goto err1; 172 + goto err; 173 173 } 174 174 175 175 /* ··· 179 179 */ 180 180 err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); 181 181 if (err) 182 - goto err1; 182 + goto err; 183 183 184 184 regs = devm_ioremap_resource(&pdev->dev, res); 185 185 if (IS_ERR(regs)) { 186 186 err = PTR_ERR(regs); 187 - goto err1; 187 + goto err; 188 188 } 189 189 190 190 /* Not all platforms can gate the clock, so it is not ··· 197 197 &pdev->dev, dev_name(&pdev->dev)); 198 198 if (!hcd) { 199 199 err = -ENOMEM; 200 - goto err2; 200 + goto err_create_hcd; 201 201 } 202 202 203 203 hcd->rsrc_start = res->start; ··· 237 237 238 238 err = usb_add_hcd(hcd, irq, IRQF_SHARED); 239 239 if (err) 240 - goto err3; 240 + goto err_add_hcd; 241 241 242 242 device_wakeup_enable(hcd->self.controller); 243 243 return 0; 244 244 245 - err3: 245 + err_add_hcd: 246 246 usb_put_hcd(hcd); 247 - err2: 247 + err_create_hcd: 248 248 if (!IS_ERR(clk)) 249 249 clk_disable_unprepare(clk); 250 - err1: 250 + err: 251 251 dev_err(&pdev->dev, "init %s fail, %d\n", 252 252 dev_name(&pdev->dev), err); 253 253