git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
drivers
/
crypto
/
hifn_795x.c
diff --git
a/drivers/crypto/hifn_795x.c
b/drivers/crypto/hifn_795x.c
index
73e8b17
..
16fce3a
100644
(file)
--- a/
drivers/crypto/hifn_795x.c
+++ b/
drivers/crypto/hifn_795x.c
@@
-638,7
+638,7
@@
struct hifn_crypto_alg
#define ASYNC_FLAGS_MISALIGNED (1<<0)
#define ASYNC_FLAGS_MISALIGNED (1<<0)
-struct
ablk
cipher_walk
+struct
hifn_
cipher_walk
{
struct scatterlist cache[ASYNC_SCATTERLIST_CACHE];
u32 flags;
{
struct scatterlist cache[ASYNC_SCATTERLIST_CACHE];
u32 flags;
@@
-657,7
+657,7
@@
struct hifn_request_context
u8 *iv;
unsigned int ivsize;
u8 op, type, mode, unused;
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)
};
#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,
return 0;
}
return 0;
}
-static int
ablkcipher_walk_init(struct ablk
cipher_walk *w,
+static int
hifn_cipher_walk_init(struct hifn_
cipher_walk *w,
int num, gfp_t gfp_flags)
{
int i;
int num, gfp_t gfp_flags)
{
int i;
@@
-1442,7
+1442,7
@@
static int ablkcipher_walk_init(struct ablkcipher_walk *w,
return i;
}
return i;
}
-static void
ablkcipher_walk_exit(struct ablk
cipher_walk *w)
+static void
hifn_cipher_walk_exit(struct hifn_
cipher_walk *w)
{
int i;
{
int i;
@@
-1486,8
+1486,8
@@
static int ablkcipher_add(unsigned int *drestp, struct scatterlist *dst,
return idx;
}
return idx;
}
-static int
ablk
cipher_walk(struct ablkcipher_request *req,
- struct
ablk
cipher_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;
{
struct scatterlist *dst, *t;
unsigned int nbytes = req->nbytes, offset, copy, diff;
@@
-1600,12
+1600,12
@@
static int hifn_setup_session(struct ablkcipher_request *req)
}
if (rctx->walk.flags & ASYNC_FLAGS_MISALIGNED) {
}
if (rctx->walk.flags & ASYNC_FLAGS_MISALIGNED) {
- err =
ablk
cipher_walk_init(&rctx->walk, idx, GFP_ATOMIC);
+ err =
hifn_
cipher_walk_init(&rctx->walk, idx, GFP_ATOMIC);
if (err < 0)
return err;
}
if (err < 0)
return err;
}
- sg_num =
ablk
cipher_walk(req, &rctx->walk);
+ sg_num =
hifn_
cipher_walk(req, &rctx->walk);
if (sg_num < 0) {
err = sg_num;
goto err_out_exit;
if (sg_num < 0) {
err = sg_num;
goto err_out_exit;
@@
-1806,7
+1806,7
@@
static void hifn_process_ready(struct ablkcipher_request *req, int error)
kunmap_atomic(saddr, KM_SOFTIRQ0);
}
kunmap_atomic(saddr, KM_SOFTIRQ0);
}
-
ablk
cipher_walk_exit(&rctx->walk);
+
hifn_
cipher_walk_exit(&rctx->walk);
}
req->base.complete(&req->base, error);
}
req->base.complete(&req->base, error);