UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: talitos - remove unused giv from ablkcipher methods 

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Kim Phillips 2011-07-15 11:21:39 +08:00 committed by Herbert Xu
parent 602dba5a81
commit febec54286
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/crypto/talitos.c
View File

@ -1429,7 +1429,6 @@ static void ablkcipher_done(struct device *dev,
static int common_nonsnoop(struct talitos_edesc *edesc, static int common_nonsnoop(struct talitos_edesc *edesc,
struct ablkcipher_request *areq, struct ablkcipher_request *areq,
u8 *giv,
void (*callback) (struct device *dev, void (*callback) (struct device *dev,
struct talitos_desc *desc, struct talitos_desc *desc,
void *context, int error)) void *context, int error))
@ -1449,7 +1448,7 @@ static int common_nonsnoop(struct talitos_edesc *edesc,
/* cipher iv */ /* cipher iv */
ivsize = crypto_ablkcipher_ivsize(cipher); ivsize = crypto_ablkcipher_ivsize(cipher);
map_single_talitos_ptr(dev, &desc->ptr[1], ivsize, giv ?: areq->info, 0, map_single_talitos_ptr(dev, &desc->ptr[1], ivsize, areq->info, 0,
DMA_TO_DEVICE); DMA_TO_DEVICE);
/* cipher key */ /* cipher key */
@ -1552,7 +1551,7 @@ static int ablkcipher_encrypt(struct ablkcipher_request *areq)
/* set encrypt */ /* set encrypt */
edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT;
return common_nonsnoop(edesc, areq, NULL, ablkcipher_done); return common_nonsnoop(edesc, areq, ablkcipher_done);
} }
static int ablkcipher_decrypt(struct ablkcipher_request *areq) static int ablkcipher_decrypt(struct ablkcipher_request *areq)
@ -1568,7 +1567,7 @@ static int ablkcipher_decrypt(struct ablkcipher_request *areq)
edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND; edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND;
return common_nonsnoop(edesc, areq, NULL, ablkcipher_done); return common_nonsnoop(edesc, areq, ablkcipher_done);
} }
static void common_nonsnoop_hash_unmap(struct device *dev, static void common_nonsnoop_hash_unmap(struct device *dev,