diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-12 15:27:54 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-09-13 08:27:26 -0400 |
| commit | 36e09e1f874baf581604a76ce81aae0538eb0a23 (patch) | |
| tree | 4a97f41ba9255097188b1c26edd6782c10fb1b68 /crypto | |
| parent | e9afc746299d39f415fdb13b1213137deb4fc497 (diff) | |
crypto: squash lines for simple wrapper functions
Remove unneeded variables and assignments.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crct10dif_generic.c | 5 | ||||
| -rw-r--r-- | crypto/mcryptd.c | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/crypto/crct10dif_generic.c b/crypto/crct10dif_generic.c index c1229614c7e3..8e94e29dc6fc 100644 --- a/crypto/crct10dif_generic.c +++ b/crypto/crct10dif_generic.c | |||
| @@ -107,10 +107,7 @@ static struct shash_alg alg = { | |||
| 107 | 107 | ||
| 108 | static int __init crct10dif_mod_init(void) | 108 | static int __init crct10dif_mod_init(void) |
| 109 | { | 109 | { |
| 110 | int ret; | 110 | return crypto_register_shash(&alg); |
| 111 | |||
| 112 | ret = crypto_register_shash(&alg); | ||
| 113 | return ret; | ||
| 114 | } | 111 | } |
| 115 | 112 | ||
| 116 | static void __exit crct10dif_mod_fini(void) | 113 | static void __exit crct10dif_mod_fini(void) |
diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c index 86fb59b109a9..94ee44acd465 100644 --- a/crypto/mcryptd.c +++ b/crypto/mcryptd.c | |||
| @@ -612,12 +612,7 @@ EXPORT_SYMBOL_GPL(mcryptd_alloc_ahash); | |||
| 612 | 612 | ||
| 613 | int ahash_mcryptd_digest(struct ahash_request *desc) | 613 | int ahash_mcryptd_digest(struct ahash_request *desc) |
| 614 | { | 614 | { |
| 615 | int err; | 615 | return crypto_ahash_init(desc) ?: ahash_mcryptd_finup(desc); |
| 616 | |||
| 617 | err = crypto_ahash_init(desc) ?: | ||
| 618 | ahash_mcryptd_finup(desc); | ||
| 619 | |||
| 620 | return err; | ||
| 621 | } | 616 | } |
| 622 | 617 | ||
| 623 | int ahash_mcryptd_update(struct ahash_request *desc) | 618 | int ahash_mcryptd_update(struct ahash_request *desc) |
