Commit 3385329a0a0f1d31ca1d011c7887006a7e5a9902
Committed by
Herbert Xu
Herbert Xu
1 parent
3789ae7dcd
Exists in
master
and in
4 other branches
crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk
This is in preparation for the generic ablkcipher_walk helpers that will be added to the crypto layer. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Showing 1 changed file with 9 additions and 9 deletions Side-by-side Diff
drivers/crypto/hifn_795x.c
| ... | ... | @@ -638,7 +638,7 @@ |
| 638 | 638 | |
| 639 | 639 | #define ASYNC_FLAGS_MISALIGNED (1<<0) |
| 640 | 640 | |
| 641 | -struct ablkcipher_walk | |
| 641 | +struct hifn_cipher_walk | |
| 642 | 642 | { |
| 643 | 643 | struct scatterlist cache[ASYNC_SCATTERLIST_CACHE]; |
| 644 | 644 | u32 flags; |
| ... | ... | @@ -657,7 +657,7 @@ |
| 657 | 657 | u8 *iv; |
| 658 | 658 | unsigned int ivsize; |
| 659 | 659 | u8 op, type, mode, unused; |
| 660 | - struct ablkcipher_walk walk; | |
| 660 | + struct hifn_cipher_walk walk; | |
| 661 | 661 | }; |
| 662 | 662 | |
| 663 | 663 | #define crypto_alg_to_hifn(a) container_of(a, struct hifn_crypto_alg, alg) |
| ... | ... | @@ -1417,7 +1417,7 @@ |
| 1417 | 1417 | return 0; |
| 1418 | 1418 | } |
| 1419 | 1419 | |
| 1420 | -static int ablkcipher_walk_init(struct ablkcipher_walk *w, | |
| 1420 | +static int hifn_cipher_walk_init(struct hifn_cipher_walk *w, | |
| 1421 | 1421 | int num, gfp_t gfp_flags) |
| 1422 | 1422 | { |
| 1423 | 1423 | int i; |
| ... | ... | @@ -1442,7 +1442,7 @@ |
| 1442 | 1442 | return i; |
| 1443 | 1443 | } |
| 1444 | 1444 | |
| 1445 | -static void ablkcipher_walk_exit(struct ablkcipher_walk *w) | |
| 1445 | +static void hifn_cipher_walk_exit(struct hifn_cipher_walk *w) | |
| 1446 | 1446 | { |
| 1447 | 1447 | int i; |
| 1448 | 1448 | |
| ... | ... | @@ -1486,8 +1486,8 @@ |
| 1486 | 1486 | return idx; |
| 1487 | 1487 | } |
| 1488 | 1488 | |
| 1489 | -static int ablkcipher_walk(struct ablkcipher_request *req, | |
| 1490 | - struct ablkcipher_walk *w) | |
| 1489 | +static int hifn_cipher_walk(struct ablkcipher_request *req, | |
| 1490 | + struct hifn_cipher_walk *w) | |
| 1491 | 1491 | { |
| 1492 | 1492 | struct scatterlist *dst, *t; |
| 1493 | 1493 | unsigned int nbytes = req->nbytes, offset, copy, diff; |
| 1494 | 1494 | |
| ... | ... | @@ -1600,12 +1600,12 @@ |
| 1600 | 1600 | } |
| 1601 | 1601 | |
| 1602 | 1602 | if (rctx->walk.flags & ASYNC_FLAGS_MISALIGNED) { |
| 1603 | - err = ablkcipher_walk_init(&rctx->walk, idx, GFP_ATOMIC); | |
| 1603 | + err = hifn_cipher_walk_init(&rctx->walk, idx, GFP_ATOMIC); | |
| 1604 | 1604 | if (err < 0) |
| 1605 | 1605 | return err; |
| 1606 | 1606 | } |
| 1607 | 1607 | |
| 1608 | - sg_num = ablkcipher_walk(req, &rctx->walk); | |
| 1608 | + sg_num = hifn_cipher_walk(req, &rctx->walk); | |
| 1609 | 1609 | if (sg_num < 0) { |
| 1610 | 1610 | err = sg_num; |
| 1611 | 1611 | goto err_out_exit; |
| ... | ... | @@ -1806,7 +1806,7 @@ |
| 1806 | 1806 | kunmap_atomic(saddr, KM_SOFTIRQ0); |
| 1807 | 1807 | } |
| 1808 | 1808 | |
| 1809 | - ablkcipher_walk_exit(&rctx->walk); | |
| 1809 | + hifn_cipher_walk_exit(&rctx->walk); | |
| 1810 | 1810 | } |
| 1811 | 1811 | |
| 1812 | 1812 | req->base.complete(&req->base, error); |