| Message ID | 20170111164537.2981-1-shuahkh@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello Shuah, On 01/11/2017 01:45 PM, Shuah Khan wrote: > Change goto labels to meaningful names from a series of errNs. > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > --- > drivers/usb/dwc3/dwc3-exynos.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c > index f7421c2..ea50f74 100644 > --- a/drivers/usb/dwc3/dwc3-exynos.c > +++ b/drivers/usb/dwc3/dwc3-exynos.c > @@ -147,53 +147,53 @@ static int dwc3_exynos_probe(struct platform_device *pdev) > exynos->vdd33 = devm_regulator_get(dev, "vdd33"); > if (IS_ERR(exynos->vdd33)) { > ret = PTR_ERR(exynos->vdd33); > - goto err2; > + goto vdd33_err; > } I think it's better to use as labels what will be done in the error path rather than what failed. IOW, "disable_axius_clk" or "disable_clks" are more clear than vdd33_err for me, since can give you an idea of what will happen in the error path. But I don't have a strong opinion and your naming is an improvement over the current one, so: Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Best regards,
Hi, Shuah Khan <shuahkh@osg.samsung.com> writes: > Change goto labels to meaningful names from a series of errNs. > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> doesn't apply to testing/next, please rebase.
On 01/16/2017 03:33 AM, Felipe Balbi wrote: > > Hi, > > Shuah Khan <shuahkh@osg.samsung.com> writes: >> Change goto labels to meaningful names from a series of errNs. >> >> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > > doesn't apply to testing/next, please rebase. > Hi Felipe, This patch is dependent on the usb: dwc3: exynos fix axius clock error path to do cleanup https://lkml.org/lkml/2017/1/10/1081 The above made it into usb-linus. It will apply to usb-next or usb-testing after it gets merged. I can resend it after the dependent patch makes it into the next rc release. thanks, -- Shuah
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c index f7421c2..ea50f74 100644 --- a/drivers/usb/dwc3/dwc3-exynos.c +++ b/drivers/usb/dwc3/dwc3-exynos.c @@ -147,53 +147,53 @@ static int dwc3_exynos_probe(struct platform_device *pdev) exynos->vdd33 = devm_regulator_get(dev, "vdd33"); if (IS_ERR(exynos->vdd33)) { ret = PTR_ERR(exynos->vdd33); - goto err2; + goto vdd33_err; } ret = regulator_enable(exynos->vdd33); if (ret) { dev_err(dev, "Failed to enable VDD33 supply\n"); - goto err2; + goto vdd33_err; } exynos->vdd10 = devm_regulator_get(dev, "vdd10"); if (IS_ERR(exynos->vdd10)) { ret = PTR_ERR(exynos->vdd10); - goto err3; + goto vdd10_err; } ret = regulator_enable(exynos->vdd10); if (ret) { dev_err(dev, "Failed to enable VDD10 supply\n"); - goto err3; + goto vdd10_err; } ret = dwc3_exynos_register_phys(exynos); if (ret) { dev_err(dev, "couldn't register PHYs\n"); - goto err4; + goto phys_err; } if (node) { ret = of_platform_populate(node, NULL, NULL, dev); if (ret) { dev_err(dev, "failed to add dwc3 core\n"); - goto err5; + goto populate_err; } } else { dev_err(dev, "no device node, failed to add dwc3 core\n"); ret = -ENODEV; - goto err5; + goto populate_err; } return 0; -err5: +populate_err: platform_device_unregister(exynos->usb2_phy); platform_device_unregister(exynos->usb3_phy); -err4: +phys_err: regulator_disable(exynos->vdd10); -err3: +vdd10_err: regulator_disable(exynos->vdd33); -err2: +vdd33_err: clk_disable_unprepare(exynos->axius_clk); axius_clk_err: clk_disable_unprepare(exynos->susp_clk);
Change goto labels to meaningful names from a series of errNs. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> --- drivers/usb/dwc3/dwc3-exynos.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)