diff options
author | David S. Miller <davem@davemloft.net> | 2010-05-18 23:56:37 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-18 23:56:37 -0400 |
commit | 3385329a0a0f1d31ca1d011c7887006a7e5a9902 (patch) | |
tree | eea8526deb7ea189cd241cdb11f507ae06ab930a | |
parent | 3789ae7dcd29fa146b23dc30377925d1f73c8adf (diff) |
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>
-rw-r--r-- | drivers/crypto/hifn_795x.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index 73e8b1713b54..16fce3aadf4d 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c | |||
@@ -638,7 +638,7 @@ struct hifn_crypto_alg | |||
638 | 638 | ||
639 | #define ASYNC_FLAGS_MISALIGNED (1<<0) | 639 | #define ASYNC_FLAGS_MISALIGNED (1<<0) |
640 | 640 | ||
641 | struct ablkcipher_walk | 641 | struct hifn_cipher_walk |
642 | { | 642 | { |
643 | struct scatterlist cache[ASYNC_SCATTERLIST_CACHE]; | 643 | struct scatterlist cache[ASYNC_SCATTERLIST_CACHE]; |
644 | u32 flags; | 644 | u32 flags; |
@@ -657,7 +657,7 @@ struct hifn_request_context | |||
657 | u8 *iv; | 657 | u8 *iv; |
658 | unsigned int ivsize; | 658 | unsigned int ivsize; |
659 | u8 op, type, mode, unused; | 659 | u8 op, type, mode, unused; |
660 | struct ablkcipher_walk walk; | 660 | struct hifn_cipher_walk walk; |
661 | }; | 661 | }; |
662 | 662 | ||
663 | #define crypto_alg_to_hifn(a) container_of(a, struct hifn_crypto_alg, alg) | 663 | #define crypto_alg_to_hifn(a) container_of(a, struct hifn_crypto_alg, alg) |
@@ -1417,7 +1417,7 @@ static int hifn_setup_dma(struct hifn_device *dev, | |||
1417 | return 0; | 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 | int num, gfp_t gfp_flags) | 1421 | int num, gfp_t gfp_flags) |
1422 | { | 1422 | { |
1423 | int i; | 1423 | int i; |
@@ -1442,7 +1442,7 @@ static int ablkcipher_walk_init(struct ablkcipher_walk *w, | |||
1442 | return i; | 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 | int i; | 1447 | int i; |
1448 | 1448 | ||
@@ -1486,8 +1486,8 @@ static int ablkcipher_add(unsigned int *drestp, struct scatterlist *dst, | |||
1486 | return idx; | 1486 | return idx; |
1487 | } | 1487 | } |
1488 | 1488 | ||
1489 | static int ablkcipher_walk(struct ablkcipher_request *req, | 1489 | static int hifn_cipher_walk(struct ablkcipher_request *req, |
1490 | struct ablkcipher_walk *w) | 1490 | struct hifn_cipher_walk *w) |
1491 | { | 1491 | { |
1492 | struct scatterlist *dst, *t; | 1492 | struct scatterlist *dst, *t; |
1493 | unsigned int nbytes = req->nbytes, offset, copy, diff; | 1493 | unsigned int nbytes = req->nbytes, offset, copy, diff; |
@@ -1600,12 +1600,12 @@ static int hifn_setup_session(struct ablkcipher_request *req) | |||
1600 | } | 1600 | } |
1601 | 1601 | ||
1602 | if (rctx->walk.flags & ASYNC_FLAGS_MISALIGNED) { | 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 | if (err < 0) | 1604 | if (err < 0) |
1605 | return err; | 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 | if (sg_num < 0) { | 1609 | if (sg_num < 0) { |
1610 | err = sg_num; | 1610 | err = sg_num; |
1611 | goto err_out_exit; | 1611 | goto err_out_exit; |
@@ -1806,7 +1806,7 @@ static void hifn_process_ready(struct ablkcipher_request *req, int error) | |||
1806 | kunmap_atomic(saddr, KM_SOFTIRQ0); | 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 | req->base.complete(&req->base, error); | 1812 | req->base.complete(&req->base, error); |