Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[powerpc.git] / crypto / compress.c

diff --git a/crypto/compress.c b/crypto/compress.c
index c12fc0c..0a65700 100644 (file)
--- a/crypto/compress.c
+++ b/crypto/compress.c
@@ -34,28 +34,16 @@ static int crypto_decompress(struct crypto_tfm *tfm,
                                                           dlen);
 }
 
-int crypto_init_compress_flags(struct crypto_tfm *tfm, u32 flags)
-{
-       return flags ? -EINVAL : 0;
-}
-
 int crypto_init_compress_ops(struct crypto_tfm *tfm)
 {
-       int ret = 0;
        struct compress_tfm *ops = &tfm->crt_compress;
-       
-       ret = tfm->__crt_alg->cra_compress.coa_init(crypto_tfm_ctx(tfm));
-       if (ret)
-               goto out;
 
        ops->cot_compress = crypto_compress;
        ops->cot_decompress = crypto_decompress;
        
-out:
-       return ret;
+       return 0;
 }
 
 void crypto_exit_compress_ops(struct crypto_tfm *tfm)
 {
-       tfm->__crt_alg->cra_compress.coa_exit(crypto_tfm_ctx(tfm));
 }