diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-07-06 16:53:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-06 16:53:09 -0400 |
| commit | 176c3652c544b6f8d4bb1984c58c10080f45dbf0 (patch) | |
| tree | a9b29e6e341484df8a0040de7506807f82be3e66 | |
| parent | 28e8c3ad9464de54a632f00ab3df88fa5f4652d1 (diff) | |
[CRYPTO] Make crypto_alg_lookup static
This patch makes a needlessly global function static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | crypto/api.c | 10 | ||||
| -rw-r--r-- | crypto/internal.h | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/crypto/api.c b/crypto/api.c index f55856b21992..0b583d24f7fa 100644 --- a/crypto/api.c +++ b/crypto/api.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/crypto.h> | 17 | #include <linux/crypto.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/kmod.h> | ||
| 19 | #include <linux/rwsem.h> | 20 | #include <linux/rwsem.h> |
| 20 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 21 | #include "internal.h" | 22 | #include "internal.h" |
| @@ -33,7 +34,7 @@ static inline void crypto_alg_put(struct crypto_alg *alg) | |||
| 33 | module_put(alg->cra_module); | 34 | module_put(alg->cra_module); |
| 34 | } | 35 | } |
| 35 | 36 | ||
| 36 | struct crypto_alg *crypto_alg_lookup(const char *name) | 37 | static struct crypto_alg *crypto_alg_lookup(const char *name) |
| 37 | { | 38 | { |
| 38 | struct crypto_alg *q, *alg = NULL; | 39 | struct crypto_alg *q, *alg = NULL; |
| 39 | 40 | ||
| @@ -54,6 +55,13 @@ struct crypto_alg *crypto_alg_lookup(const char *name) | |||
| 54 | return alg; | 55 | return alg; |
| 55 | } | 56 | } |
| 56 | 57 | ||
| 58 | /* A far more intelligent version of this is planned. For now, just | ||
| 59 | * try an exact match on the name of the algorithm. */ | ||
| 60 | static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name) | ||
| 61 | { | ||
| 62 | return try_then_request_module(crypto_alg_lookup(name), name); | ||
| 63 | } | ||
| 64 | |||
| 57 | static int crypto_init_flags(struct crypto_tfm *tfm, u32 flags) | 65 | static int crypto_init_flags(struct crypto_tfm *tfm, u32 flags) |
| 58 | { | 66 | { |
| 59 | tfm->crt_flags = 0; | 67 | tfm->crt_flags = 0; |
diff --git a/crypto/internal.h b/crypto/internal.h index 5ed383f7dce6..83b1b6d6d92b 100644 --- a/crypto/internal.h +++ b/crypto/internal.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/highmem.h> | 16 | #include <linux/highmem.h> |
| 17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/kmod.h> | ||
| 20 | #include <asm/kmap_types.h> | 19 | #include <asm/kmap_types.h> |
| 21 | 20 | ||
| 22 | extern enum km_type crypto_km_types[]; | 21 | extern enum km_type crypto_km_types[]; |
| @@ -42,15 +41,6 @@ static inline void crypto_yield(struct crypto_tfm *tfm) | |||
| 42 | cond_resched(); | 41 | cond_resched(); |
| 43 | } | 42 | } |
| 44 | 43 | ||
| 45 | struct crypto_alg *crypto_alg_lookup(const char *name); | ||
| 46 | |||
| 47 | /* A far more intelligent version of this is planned. For now, just | ||
| 48 | * try an exact match on the name of the algorithm. */ | ||
| 49 | static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name) | ||
| 50 | { | ||
| 51 | return try_then_request_module(crypto_alg_lookup(name), name); | ||
| 52 | } | ||
| 53 | |||
| 54 | #ifdef CONFIG_CRYPTO_HMAC | 44 | #ifdef CONFIG_CRYPTO_HMAC |
| 55 | int crypto_alloc_hmac_block(struct crypto_tfm *tfm); | 45 | int crypto_alloc_hmac_block(struct crypto_tfm *tfm); |
| 56 | void crypto_free_hmac_block(struct crypto_tfm *tfm); | 46 | void crypto_free_hmac_block(struct crypto_tfm *tfm); |
