xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ste_dma40: Rename a jump label in d40_probe()

Browse Source 
Adjust jump labels according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Markus Elfring
2016-09-17 14:50:53 +02:00
committed by Vinod Koul
parent 876e023524
commit d7b7ecce4b
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/dma/ste_dma40.c
View File

@@ -3572,7 +3572,7 @@ static int __init d40_probe(struct platform_device *pdev)
if (!res) { if (!res) {
ret = -ENOENT; ret = -ENOENT;
d40_err(&pdev->dev, "No \"lcpa\" memory resource\n"); d40_err(&pdev->dev, "No \"lcpa\" memory resource\n");
goto failure; goto destroy_cache;
} }
base->lcpa_size = resource_size(res); base->lcpa_size = resource_size(res);
base->phy_lcpa = res->start; base->phy_lcpa = res->start;
@@ -3581,7 +3581,7 @@ static int __init d40_probe(struct platform_device *pdev)
D40_NAME " I/O lcpa") == NULL) { D40_NAME " I/O lcpa") == NULL) {
ret = -EBUSY; ret = -EBUSY;
d40_err(&pdev->dev, "Failed to request LCPA region %pR\n", res); d40_err(&pdev->dev, "Failed to request LCPA region %pR\n", res);
goto failure; goto destroy_cache;
} }
/* We make use of ESRAM memory for this. */ /* We make use of ESRAM memory for this. */
@@ -3597,7 +3597,7 @@ static int __init d40_probe(struct platform_device *pdev)
if (!base->lcpa_base) { if (!base->lcpa_base) {
ret = -ENOMEM; ret = -ENOMEM;
d40_err(&pdev->dev, "Failed to ioremap LCPA region\n"); d40_err(&pdev->dev, "Failed to ioremap LCPA region\n");
goto failure; goto destroy_cache;
} }
/* If lcla has to be located in ESRAM we don't need to allocate */ /* If lcla has to be located in ESRAM we don't need to allocate */
if (base->plat_data->use_esram_lcla) { if (base->plat_data->use_esram_lcla) {
@@ -3607,14 +3607,14 @@ static int __init d40_probe(struct platform_device *pdev)
ret = -ENOENT; ret = -ENOENT;
d40_err(&pdev->dev, d40_err(&pdev->dev,
"No \"lcla_esram\" memory resource\n"); "No \"lcla_esram\" memory resource\n");
goto failure; goto destroy_cache;
} }
base->lcla_pool.base = ioremap(res->start, base->lcla_pool.base = ioremap(res->start,
resource_size(res)); resource_size(res));
if (!base->lcla_pool.base) { if (!base->lcla_pool.base) {
ret = -ENOMEM; ret = -ENOMEM;
d40_err(&pdev->dev, "Failed to ioremap LCLA region\n"); d40_err(&pdev->dev, "Failed to ioremap LCLA region\n");
goto failure; goto destroy_cache;
} }
writel(res->start, base->virtbase + D40_DREG_LCLA); writel(res->start, base->virtbase + D40_DREG_LCLA);
@@ -3622,7 +3622,7 @@ static int __init d40_probe(struct platform_device *pdev)
ret = d40_lcla_allocate(base); ret = d40_lcla_allocate(base);
if (ret) { if (ret) {
d40_err(&pdev->dev, "Failed to allocate LCLA area\n"); d40_err(&pdev->dev, "Failed to allocate LCLA area\n");
goto failure; goto destroy_cache;
} }
} }
@@ -3633,7 +3633,7 @@ static int __init d40_probe(struct platform_device *pdev)
ret = request_irq(base->irq, d40_handle_interrupt, 0, D40_NAME, base); ret = request_irq(base->irq, d40_handle_interrupt, 0, D40_NAME, base);
if (ret) { if (ret) {
d40_err(&pdev->dev, "No IRQ defined\n"); d40_err(&pdev->dev, "No IRQ defined\n");
goto failure; goto destroy_cache;
} }
if (base->plat_data->use_esram_lcla) { if (base->plat_data->use_esram_lcla) {
@@ -3643,7 +3643,7 @@ static int __init d40_probe(struct platform_device *pdev)
d40_err(&pdev->dev, "Failed to get lcpa_regulator\n"); d40_err(&pdev->dev, "Failed to get lcpa_regulator\n");
ret = PTR_ERR(base->lcpa_regulator); ret = PTR_ERR(base->lcpa_regulator);
base->lcpa_regulator = NULL; base->lcpa_regulator = NULL;
goto failure; goto destroy_cache;
} }
ret = regulator_enable(base->lcpa_regulator); ret = regulator_enable(base->lcpa_regulator);
@@ -3652,7 +3652,7 @@ static int __init d40_probe(struct platform_device *pdev)
"Failed to enable lcpa_regulator\n"); "Failed to enable lcpa_regulator\n");
regulator_put(base->lcpa_regulator); regulator_put(base->lcpa_regulator);
base->lcpa_regulator = NULL; base->lcpa_regulator = NULL;
goto failure; goto destroy_cache;
} }
} }
@@ -3667,13 +3667,13 @@ static int __init d40_probe(struct platform_device *pdev)
ret = d40_dmaengine_init(base, num_reserved_chans); ret = d40_dmaengine_init(base, num_reserved_chans);
if (ret) if (ret)
goto failure; goto destroy_cache;
base->dev->dma_parms = &base->dma_parms; base->dev->dma_parms = &base->dma_parms;
ret = dma_set_max_seg_size(base->dev, STEDMA40_MAX_SEG_SIZE); ret = dma_set_max_seg_size(base->dev, STEDMA40_MAX_SEG_SIZE);
if (ret) { if (ret) {
d40_err(&pdev->dev, "Failed to set dma max seg size\n"); d40_err(&pdev->dev, "Failed to set dma max seg size\n");
goto failure; goto destroy_cache;
} }
d40_hw_init(base); d40_hw_init(base);
@@ -3687,8 +3687,7 @@ static int __init d40_probe(struct platform_device *pdev)
dev_info(base->dev, "initialized\n"); dev_info(base->dev, "initialized\n");
return 0; return 0;
destroy_cache:
failure:
kmem_cache_destroy(base->desc_slab); kmem_cache_destroy(base->desc_slab);
if (base->virtbase) if (base->virtbase)
iounmap(base->virtbase); iounmap(base->virtbase);