In p8_init(), remove the goto statement and return ret directly.

Remove any redundant includes, add a missing space in MODULE_AUTHOR(),
and join the MODULE_DESCRIPTION() strings for better grepability.

Also remove MODULE_VERSION(). It has never been updated and the kernel
release better reflects the module version.

Signed-off-by: Thorsten Blum <[email protected]>
---
 arch/powerpc/crypto/vmx.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/arch/powerpc/crypto/vmx.c b/arch/powerpc/crypto/vmx.c
index 08da5311dfdf..8abc4db8ee4e 100644
--- a/arch/powerpc/crypto/vmx.c
+++ b/arch/powerpc/crypto/vmx.c
@@ -8,12 +8,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-#include <linux/err.h>
 #include <linux/cpufeature.h>
-#include <linux/crypto.h>
-#include <asm/cputable.h>
 #include <crypto/internal/skcipher.h>
 
 #include "aesp8-ppc.h"
@@ -24,7 +19,7 @@ static int __init p8_init(void)
 
        ret = crypto_register_skcipher(&p8_aes_cbc_alg);
        if (ret)
-               goto err;
+               return ret;
 
        ret = crypto_register_skcipher(&p8_aes_ctr_alg);
        if (ret)
@@ -40,7 +35,6 @@ static int __init p8_init(void)
        crypto_unregister_skcipher(&p8_aes_ctr_alg);
 err_unregister_aes_cbc:
        crypto_unregister_skcipher(&p8_aes_cbc_alg);
-err:
        return ret;
 }
 
@@ -54,8 +48,6 @@ static void __exit p8_exit(void)
 module_cpu_feature_match(PPC_MODULE_FEATURE_VEC_CRYPTO, p8_init);
 module_exit(p8_exit);
 
-MODULE_AUTHOR("Marcelo Cerri<[email protected]>");
-MODULE_DESCRIPTION("IBM VMX cryptographic acceleration instructions "
-                  "support on Power 8");
+MODULE_AUTHOR("Marcelo Cerri <[email protected]>");
+MODULE_DESCRIPTION("IBM VMX cryptographic acceleration instructions support on 
Power 8");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("1.0.0");

Reply via email to