aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorLEROY Christophe <christophe.leroy@c-s.fr>2015-04-17 10:31:57 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-04-20 21:14:40 -0400
commita2b35aa86eeaca6c1d416e3c43d44222c34727fb (patch)
treef989398ef33bb1787e6f09e9a22d74cfa0b091da /drivers/crypto
parent185eb79f6a6536c2b61d2638e138ca439bd327c3 (diff)
crypto: talitos - remove param 'extent' in map_single_talitos_ptr()
map_single_talitos_ptr() is always called with extent == 0, so lets remove this unused parameter Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/talitos.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index c93f79b8bef8..81e5636a2a4e 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -72,14 +72,13 @@ static void to_talitos_ptr_extent_clear(struct talitos_ptr *ptr)
72static void map_single_talitos_ptr(struct device *dev, 72static void map_single_talitos_ptr(struct device *dev,
73 struct talitos_ptr *ptr, 73 struct talitos_ptr *ptr,
74 unsigned short len, void *data, 74 unsigned short len, void *data,
75 unsigned char extent,
76 enum dma_data_direction dir) 75 enum dma_data_direction dir)
77{ 76{
78 dma_addr_t dma_addr = dma_map_single(dev, data, len, dir); 77 dma_addr_t dma_addr = dma_map_single(dev, data, len, dir);
79 78
80 ptr->len = cpu_to_be16(len); 79 ptr->len = cpu_to_be16(len);
81 to_talitos_ptr(ptr, dma_addr); 80 to_talitos_ptr(ptr, dma_addr);
82 ptr->j_extent = extent; 81 to_talitos_ptr_extent_clear(ptr);
83} 82}
84 83
85/* 84/*
@@ -958,7 +957,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,
958 957
959 /* hmac key */ 958 /* hmac key */
960 map_single_talitos_ptr(dev, &desc->ptr[0], ctx->authkeylen, &ctx->key, 959 map_single_talitos_ptr(dev, &desc->ptr[0], ctx->authkeylen, &ctx->key,
961 0, DMA_TO_DEVICE); 960 DMA_TO_DEVICE);
962 961
963 /* hmac data */ 962 /* hmac data */
964 desc->ptr[1].len = cpu_to_be16(areq->assoclen + ivsize); 963 desc->ptr[1].len = cpu_to_be16(areq->assoclen + ivsize);
@@ -1002,7 +1001,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,
1002 1001
1003 /* cipher key */ 1002 /* cipher key */
1004 map_single_talitos_ptr(dev, &desc->ptr[3], ctx->enckeylen, 1003 map_single_talitos_ptr(dev, &desc->ptr[3], ctx->enckeylen,
1005 (char *)&ctx->key + ctx->authkeylen, 0, 1004 (char *)&ctx->key + ctx->authkeylen,
1006 DMA_TO_DEVICE); 1005 DMA_TO_DEVICE);
1007 1006
1008 /* 1007 /*
@@ -1080,7 +1079,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq,
1080 } 1079 }
1081 1080
1082 /* iv out */ 1081 /* iv out */
1083 map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv, 0, 1082 map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv,
1084 DMA_FROM_DEVICE); 1083 DMA_FROM_DEVICE);
1085 1084
1086 ret = talitos_submit(dev, ctx->ch, desc, callback, areq); 1085 ret = talitos_submit(dev, ctx->ch, desc, callback, areq);
@@ -1453,7 +1452,7 @@ static int common_nonsnoop(struct talitos_edesc *edesc,
1453 1452
1454 /* cipher key */ 1453 /* cipher key */
1455 map_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen, 1454 map_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen,
1456 (char *)&ctx->key, 0, DMA_TO_DEVICE); 1455 (char *)&ctx->key, DMA_TO_DEVICE);
1457 1456
1458 /* 1457 /*
1459 * cipher in 1458 * cipher in
@@ -1470,7 +1469,7 @@ static int common_nonsnoop(struct talitos_edesc *edesc,
1470 &desc->ptr[4], sg_count); 1469 &desc->ptr[4], sg_count);
1471 1470
1472 /* iv out */ 1471 /* iv out */
1473 map_single_talitos_ptr(dev, &desc->ptr[5], ivsize, ctx->iv, 0, 1472 map_single_talitos_ptr(dev, &desc->ptr[5], ivsize, ctx->iv,
1474 DMA_FROM_DEVICE); 1473 DMA_FROM_DEVICE);
1475 1474
1476 /* last DWORD empty */ 1475 /* last DWORD empty */
@@ -1595,7 +1594,7 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,
1595 if (!req_ctx->first || req_ctx->swinit) { 1594 if (!req_ctx->first || req_ctx->swinit) {
1596 map_single_talitos_ptr(dev, &desc->ptr[1], 1595 map_single_talitos_ptr(dev, &desc->ptr[1],
1597 req_ctx->hw_context_size, 1596 req_ctx->hw_context_size,
1598 (char *)req_ctx->hw_context, 0, 1597 (char *)req_ctx->hw_context,
1599 DMA_TO_DEVICE); 1598 DMA_TO_DEVICE);
1600 req_ctx->swinit = 0; 1599 req_ctx->swinit = 0;
1601 } else { 1600 } else {
@@ -1607,7 +1606,7 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,
1607 /* HMAC key */ 1606 /* HMAC key */
1608 if (ctx->keylen) 1607 if (ctx->keylen)
1609 map_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen, 1608 map_single_talitos_ptr(dev, &desc->ptr[2], ctx->keylen,
1610 (char *)&ctx->key, 0, DMA_TO_DEVICE); 1609 (char *)&ctx->key, DMA_TO_DEVICE);
1611 else 1610 else
1612 desc->ptr[2] = zero_entry; 1611 desc->ptr[2] = zero_entry;
1613 1612
@@ -1624,11 +1623,11 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,
1624 if (req_ctx->last) 1623 if (req_ctx->last)
1625 map_single_talitos_ptr(dev, &desc->ptr[5], 1624 map_single_talitos_ptr(dev, &desc->ptr[5],
1626 crypto_ahash_digestsize(tfm), 1625 crypto_ahash_digestsize(tfm),
1627 areq->result, 0, DMA_FROM_DEVICE); 1626 areq->result, DMA_FROM_DEVICE);
1628 else 1627 else
1629 map_single_talitos_ptr(dev, &desc->ptr[5], 1628 map_single_talitos_ptr(dev, &desc->ptr[5],
1630 req_ctx->hw_context_size, 1629 req_ctx->hw_context_size,
1631 req_ctx->hw_context, 0, DMA_FROM_DEVICE); 1630 req_ctx->hw_context, DMA_FROM_DEVICE);
1632 1631
1633 /* last DWORD empty */ 1632 /* last DWORD empty */
1634 desc->ptr[6] = zero_entry; 1633 desc->ptr[6] = zero_entry;