aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2016-09-17 02:23:37 -0400
committerVinod Koul <vinod.koul@intel.com>2016-09-26 13:36:16 -0400
commitaae32ec6e39a513f2049b2d37825957971d4f7f1 (patch)
tree5e54b6ef18dc355a76bd1f51f0107007115fb123
parent2c7f2f20da9d3fe13ed08d1661ebc12d4ce0cab9 (diff)
ste_dma40: Rename a jump label in d40_lcla_allocate()
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>
-rw-r--r--drivers/dma/ste_dma40.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index b4dd5910ffb1..6f198a31e619 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -3431,7 +3431,7 @@ static int __init d40_lcla_allocate(struct d40_base *base)
3431 3431
3432 for (j = 0; j < i; j++) 3432 for (j = 0; j < i; j++)
3433 free_pages(page_list[j], base->lcla_pool.pages); 3433 free_pages(page_list[j], base->lcla_pool.pages);
3434 goto failure; 3434 goto free_page_list;
3435 } 3435 }
3436 3436
3437 if ((virt_to_phys((void *)page_list[i]) & 3437 if ((virt_to_phys((void *)page_list[i]) &
@@ -3458,7 +3458,7 @@ static int __init d40_lcla_allocate(struct d40_base *base)
3458 GFP_KERNEL); 3458 GFP_KERNEL);
3459 if (!base->lcla_pool.base_unaligned) { 3459 if (!base->lcla_pool.base_unaligned) {
3460 ret = -ENOMEM; 3460 ret = -ENOMEM;
3461 goto failure; 3461 goto free_page_list;
3462 } 3462 }
3463 3463
3464 base->lcla_pool.base = PTR_ALIGN(base->lcla_pool.base_unaligned, 3464 base->lcla_pool.base = PTR_ALIGN(base->lcla_pool.base_unaligned,
@@ -3471,12 +3471,12 @@ static int __init d40_lcla_allocate(struct d40_base *base)
3471 if (dma_mapping_error(base->dev, pool->dma_addr)) { 3471 if (dma_mapping_error(base->dev, pool->dma_addr)) {
3472 pool->dma_addr = 0; 3472 pool->dma_addr = 0;
3473 ret = -ENOMEM; 3473 ret = -ENOMEM;
3474 goto failure; 3474 goto free_page_list;
3475 } 3475 }
3476 3476
3477 writel(virt_to_phys(base->lcla_pool.base), 3477 writel(virt_to_phys(base->lcla_pool.base),
3478 base->virtbase + D40_DREG_LCLA); 3478 base->virtbase + D40_DREG_LCLA);
3479failure: 3479 free_page_list:
3480 kfree(page_list); 3480 kfree(page_list);
3481 return ret; 3481 return ret;
3482} 3482}