mfd: let asic3 use mem resource instead of bus_shift

[linux-2.6] / include / linux / crypto.h

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index b6efe569128d8cf5a786100346a65789ad8fdd08..c43dc47fdf75e8127498a79290c6c10ef4b945e8 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -137,8 +137,6 @@ struct ablkcipher_request {
 struct ahash_request {
        struct crypto_async_request base;
 
-       void *info;
-
        unsigned int nbytes;
        struct scatterlist *src;
        u8                 *result;
@@ -420,7 +418,6 @@ struct ahash_tfm {
                        unsigned int keylen);
 
        unsigned int digestsize;
-       struct crypto_ahash *base;
        unsigned int reqsize;
 };
 
@@ -484,10 +481,6 @@ struct crypto_hash {
        struct crypto_tfm base;
 };
 
-struct crypto_ahash {
-       struct crypto_tfm base;
-};
-
 enum {
        CRYPTOA_UNSPEC,
        CRYPTOA_ALG,
@@ -1311,137 +1304,5 @@ static inline int crypto_comp_decompress(struct crypto_comp *tfm,
                                                    src, slen, dst, dlen);
 }
 
-static inline struct crypto_ahash *__crypto_ahash_cast(struct crypto_tfm *tfm)
-{
-       return (struct crypto_ahash *)tfm;
-}
-
-static inline struct crypto_ahash *crypto_alloc_ahash(const char *alg_name,
-                                                     u32 type, u32 mask)
-{
-       type &= ~CRYPTO_ALG_TYPE_MASK;
-       mask &= ~CRYPTO_ALG_TYPE_MASK;
-       type |= CRYPTO_ALG_TYPE_AHASH;
-       mask |= CRYPTO_ALG_TYPE_AHASH_MASK;
-
-       return __crypto_ahash_cast(crypto_alloc_base(alg_name, type, mask));
-}
-
-static inline struct crypto_tfm *crypto_ahash_tfm(struct crypto_ahash *tfm)
-{
-       return &tfm->base;
-}
-
-static inline void crypto_free_ahash(struct crypto_ahash *tfm)
-{
-       crypto_free_tfm(crypto_ahash_tfm(tfm));
-}
-
-static inline unsigned int crypto_ahash_alignmask(
-       struct crypto_ahash *tfm)
-{
-       return crypto_tfm_alg_alignmask(crypto_ahash_tfm(tfm));
-}
-
-static inline struct ahash_tfm *crypto_ahash_crt(struct crypto_ahash *tfm)
-{
-       return &crypto_ahash_tfm(tfm)->crt_ahash;
-}
-
-static inline unsigned int crypto_ahash_digestsize(struct crypto_ahash *tfm)
-{
-       return crypto_ahash_crt(tfm)->digestsize;
-}
-
-static inline u32 crypto_ahash_get_flags(struct crypto_ahash *tfm)
-{
-       return crypto_tfm_get_flags(crypto_ahash_tfm(tfm));
-}
-
-static inline void crypto_ahash_set_flags(struct crypto_ahash *tfm, u32 flags)
-{
-       crypto_tfm_set_flags(crypto_ahash_tfm(tfm), flags);
-}
-
-static inline void crypto_ahash_clear_flags(struct crypto_ahash *tfm, u32 flags)
-{
-       crypto_tfm_clear_flags(crypto_ahash_tfm(tfm), flags);
-}
-
-static inline struct crypto_ahash *crypto_ahash_reqtfm(
-       struct ahash_request *req)
-{
-       return __crypto_ahash_cast(req->base.tfm);
-}
-
-static inline unsigned int crypto_ahash_reqsize(struct crypto_ahash *tfm)
-{
-       return crypto_ahash_crt(tfm)->reqsize;
-}
-
-static inline int crypto_ahash_setkey(struct crypto_ahash *tfm,
-                                     const u8 *key, unsigned int keylen)
-{
-       struct ahash_tfm *crt = crypto_ahash_crt(tfm);
-
-       return crt->setkey(crt->base, key, keylen);
-}
-
-static inline int crypto_ahash_digest(struct ahash_request *req)
-{
-       struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req));
-       return crt->digest(req);
-}
-
-static inline void ahash_request_set_tfm(struct ahash_request *req,
-                                        struct crypto_ahash *tfm)
-{
-       req->base.tfm = crypto_ahash_tfm(crypto_ahash_crt(tfm)->base);
-}
-
-static inline struct ahash_request *ahash_request_alloc(
-       struct crypto_ahash *tfm, gfp_t gfp)
-{
-       struct ahash_request *req;
-
-       req = kmalloc(sizeof(struct ahash_request) +
-                     crypto_ahash_reqsize(tfm), gfp);
-
-       if (likely(req))
-               ahash_request_set_tfm(req, tfm);
-
-       return req;
-}
-
-static inline void ahash_request_free(struct ahash_request *req)
-{
-       kfree(req);
-}
-
-static inline struct ahash_request *ahash_request_cast(
-       struct crypto_async_request *req)
-{
-       return container_of(req, struct ahash_request, base);
-}
-
-static inline void ahash_request_set_callback(struct ahash_request *req,
-                                             u32 flags,
-                                             crypto_completion_t complete,
-                                             void *data)
-{
-       req->base.complete = complete;
-       req->base.data = data;
-       req->base.flags = flags;
-}
-
-static inline void ahash_request_set_crypt(struct ahash_request *req,
-                                          struct scatterlist *src, u8 *result,
-                                          unsigned int nbytes)
-{
-       req->src = src;
-       req->nbytes = nbytes;
-       req->result = result;
-}
-
 #endif /* _LINUX_CRYPTO_H */