aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2016-09-15 07:54:49 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2016-09-22 06:27:41 -0400
commitd6e7a7d0c2c5170234f0afb94b2bcdaf93630a72 (patch)
tree6ed2af49dd57b81f133cc750c6abbfa4df977701
parente7a33c4d0a97e80fe059f711621ad7a65b30a64d (diff)
crypto: caam - Rename jump labels in ahash_setkey()
Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/caam/caamhash.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index f19df8f30f2d..60174706205e 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -533,7 +533,7 @@ static int ahash_setkey(struct crypto_ahash *ahash,
533 ret = hash_digest_key(ctx, key, &keylen, hashed_key, 533 ret = hash_digest_key(ctx, key, &keylen, hashed_key,
534 digestsize); 534 digestsize);
535 if (ret) 535 if (ret)
536 goto badkey; 536 goto bad_free_key;
537 key = hashed_key; 537 key = hashed_key;
538 } 538 }
539 539
@@ -551,14 +551,14 @@ static int ahash_setkey(struct crypto_ahash *ahash,
551 551
552 ret = gen_split_hash_key(ctx, key, keylen); 552 ret = gen_split_hash_key(ctx, key, keylen);
553 if (ret) 553 if (ret)
554 goto badkey; 554 goto bad_free_key;
555 555
556 ctx->key_dma = dma_map_single(jrdev, ctx->key, ctx->split_key_pad_len, 556 ctx->key_dma = dma_map_single(jrdev, ctx->key, ctx->split_key_pad_len,
557 DMA_TO_DEVICE); 557 DMA_TO_DEVICE);
558 if (dma_mapping_error(jrdev, ctx->key_dma)) { 558 if (dma_mapping_error(jrdev, ctx->key_dma)) {
559 dev_err(jrdev, "unable to map key i/o memory\n"); 559 dev_err(jrdev, "unable to map key i/o memory\n");
560 ret = -ENOMEM; 560 ret = -ENOMEM;
561 goto map_err; 561 goto error_free_key;
562 } 562 }
563#ifdef DEBUG 563#ifdef DEBUG
564 print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ", 564 print_hex_dump(KERN_ERR, "ctx.key@"__stringify(__LINE__)": ",
@@ -571,11 +571,10 @@ static int ahash_setkey(struct crypto_ahash *ahash,
571 dma_unmap_single(jrdev, ctx->key_dma, ctx->split_key_pad_len, 571 dma_unmap_single(jrdev, ctx->key_dma, ctx->split_key_pad_len,
572 DMA_TO_DEVICE); 572 DMA_TO_DEVICE);
573 } 573 }
574 574 error_free_key:
575map_err:
576 kfree(hashed_key); 575 kfree(hashed_key);
577 return ret; 576 return ret;
578badkey: 577 bad_free_key:
579 kfree(hashed_key); 578 kfree(hashed_key);
580 crypto_ahash_set_flags(ahash, CRYPTO_TFM_RES_BAD_KEY_LEN); 579 crypto_ahash_set_flags(ahash, CRYPTO_TFM_RES_BAD_KEY_LEN);
581 return -EINVAL; 580 return -EINVAL;