Skip to content

Commit

Permalink
crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller authored and Herbert Xu committed May 19, 2010
1 parent 3789ae7 commit 3385329
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/crypto/hifn_795x.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ struct hifn_crypto_alg

#define ASYNC_FLAGS_MISALIGNED (1<<0)

struct ablkcipher_walk
struct hifn_cipher_walk
{
struct scatterlist cache[ASYNC_SCATTERLIST_CACHE];
u32 flags;
Expand All @@ -657,7 +657,7 @@ struct hifn_request_context
u8 *iv;
unsigned int ivsize;
u8 op, type, mode, unused;
struct ablkcipher_walk walk;
struct hifn_cipher_walk walk;
};

#define crypto_alg_to_hifn(a) container_of(a, struct hifn_crypto_alg, alg)
Expand Down Expand Up @@ -1417,7 +1417,7 @@ static int hifn_setup_dma(struct hifn_device *dev,
return 0;
}

static int ablkcipher_walk_init(struct ablkcipher_walk *w,
static int hifn_cipher_walk_init(struct hifn_cipher_walk *w,
int num, gfp_t gfp_flags)
{
int i;
Expand All @@ -1442,7 +1442,7 @@ static int ablkcipher_walk_init(struct ablkcipher_walk *w,
return i;
}

static void ablkcipher_walk_exit(struct ablkcipher_walk *w)
static void hifn_cipher_walk_exit(struct hifn_cipher_walk *w)
{
int i;

Expand Down Expand Up @@ -1486,8 +1486,8 @@ static int ablkcipher_add(unsigned int *drestp, struct scatterlist *dst,
return idx;
}

static int ablkcipher_walk(struct ablkcipher_request *req,
struct ablkcipher_walk *w)
static int hifn_cipher_walk(struct ablkcipher_request *req,
struct hifn_cipher_walk *w)
{
struct scatterlist *dst, *t;
unsigned int nbytes = req->nbytes, offset, copy, diff;
Expand Down Expand Up @@ -1600,12 +1600,12 @@ static int hifn_setup_session(struct ablkcipher_request *req)
}

if (rctx->walk.flags & ASYNC_FLAGS_MISALIGNED) {
err = ablkcipher_walk_init(&rctx->walk, idx, GFP_ATOMIC);
err = hifn_cipher_walk_init(&rctx->walk, idx, GFP_ATOMIC);
if (err < 0)
return err;
}

sg_num = ablkcipher_walk(req, &rctx->walk);
sg_num = hifn_cipher_walk(req, &rctx->walk);
if (sg_num < 0) {
err = sg_num;
goto err_out_exit;
Expand Down Expand Up @@ -1806,7 +1806,7 @@ static void hifn_process_ready(struct ablkcipher_request *req, int error)
kunmap_atomic(saddr, KM_SOFTIRQ0);
}

ablkcipher_walk_exit(&rctx->walk);
hifn_cipher_walk_exit(&rctx->walk);
}

req->base.complete(&req->base, error);
Expand Down

0 comments on commit 3385329

Please sign in to comment.