Skip to content

Commit

Permalink
usb: ehci-orion: rename error goto labels in ehci_orion_drv_probe()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Alan Stern <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
tpetazzoni authored and gregkh committed May 27, 2014
1 parent 88bf6b3 commit d8ea69e
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/usb/host/ehci-orion.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
"Found HC with no IRQ. Check %s setup!\n",
dev_name(&pdev->dev));
err = -ENODEV;
goto err1;
goto err;
}

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Expand All @@ -169,7 +169,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
"Found HC with no register addr. Check %s setup!\n",
dev_name(&pdev->dev));
err = -ENODEV;
goto err1;
goto err;
}

/*
Expand All @@ -179,12 +179,12 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
*/
err = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err)
goto err1;
goto err;

regs = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(regs)) {
err = PTR_ERR(regs);
goto err1;
goto err;
}

/* Not all platforms can gate the clock, so it is not
Expand All @@ -197,7 +197,7 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
&pdev->dev, dev_name(&pdev->dev));
if (!hcd) {
err = -ENOMEM;
goto err2;
goto err_create_hcd;
}

hcd->rsrc_start = res->start;
Expand Down Expand Up @@ -237,17 +237,17 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)

err = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (err)
goto err3;
goto err_add_hcd;

device_wakeup_enable(hcd->self.controller);
return 0;

err3:
err_add_hcd:
usb_put_hcd(hcd);
err2:
err_create_hcd:
if (!IS_ERR(clk))
clk_disable_unprepare(clk);
err1:
err:
dev_err(&pdev->dev, "init %s fail, %d\n",
dev_name(&pdev->dev), err);

Expand Down

0 comments on commit d8ea69e

Please sign in to comment.