drm/fb: use printk to print out the switching to text mode error.

[safe/jmp/linux-2.6] / crypto / compress.c

diff --git a/crypto/compress.c b/crypto/compress.c
index eb36d93..c33f076 100644 (file)
--- a/crypto/compress.c
+++ b/crypto/compress.c
@@ -7,14 +7,13 @@
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option) 
+ * Software Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
  */
 #include <linux/types.h>
 #include <linux/crypto.h>
 #include <linux/errno.h>
-#include <asm/scatterlist.h>
 #include <linux/string.h>
 #include "internal.h"
 
@@ -22,8 +21,7 @@ static int crypto_compress(struct crypto_tfm *tfm,
                             const u8 *src, unsigned int slen,
                             u8 *dst, unsigned int *dlen)
 {
-       return tfm->__crt_alg->cra_compress.coa_compress(crypto_tfm_ctx(tfm),
-                                                        src, slen, dst,
+       return tfm->__crt_alg->cra_compress.coa_compress(tfm, src, slen, dst,
                                                         dlen);
 }
 
@@ -31,33 +29,20 @@ static int crypto_decompress(struct crypto_tfm *tfm,
                              const u8 *src, unsigned int slen,
                              u8 *dst, unsigned int *dlen)
 {
-       return tfm->__crt_alg->cra_compress.coa_decompress(crypto_tfm_ctx(tfm),
-                                                          src, slen, dst,
+       return tfm->__crt_alg->cra_compress.coa_decompress(tfm, src, slen, dst,
                                                           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));
 }