Revert "crypto/nx: Rename nx842_powernv_function as icswx function"

BugLink: http://bugs.launchpad.net/bugs/1721391
This reverts commit deab72184618d57ada043a5bbbc629e123c643d5.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/crypto/nx/nx-842-powernv.c b/drivers/crypto/nx/nx-842-powernv.c
index 161987698bbc3f07b3b08e2a54feb2c735419b90..3abb045cdba72bbf462e81b9cd769e3f2de0bbc6 100644 (file)
--- a/drivers/crypto/nx/nx-842-powernv.c
+++ b/drivers/crypto/nx/nx-842-powernv.c
@@ -54,11 +54,7 @@ struct nx842_coproc {
 
 /* no cpu hotplug on powernv, so this list never changes after init */
 static LIST_HEAD(nx842_coprocs);
-static unsigned int nx842_ct;  /* used in icswx function */
-
-static int (*nx842_powernv_exec)(const unsigned char *in,
-                               unsigned int inlen, unsigned char *out,
-                               unsigned int *outlenp, void *workmem, int fc);
+static unsigned int nx842_ct;
 
 /**
  * setup_indirect_dde - Setup an indirect DDE
@@ -359,7 +355,7 @@ static int wait_for_csb(struct nx842_workmem *wmem,
 }
 
 /**
- * nx842_exec_icswx - compress/decompress data using the 842 algorithm
+ * nx842_powernv_function - compress/decompress data using the 842 algorithm
  *
  * (De)compression provided by the NX842 coprocessor on IBM PowerNV systems.
  * This compresses or decompresses the provided input buffer into the provided
@@ -389,7 +385,7 @@ static int wait_for_csb(struct nx842_workmem *wmem,
  *   -ETIMEDOUT        hardware did not complete operation in reasonable time
  *   -EINTR    operation was aborted
  */
-static int nx842_exec_icswx(const unsigned char *in, unsigned int inlen,
+static int nx842_powernv_function(const unsigned char *in, unsigned int inlen,
                                  unsigned char *out, unsigned int *outlenp,
                                  void *workmem, int fc)
 {
@@ -493,13 +489,13 @@ static int nx842_exec_icswx(const unsigned char *in, unsigned int inlen,
  * @workmem: working memory buffer pointer, size determined by
  *           nx842_powernv_driver.workmem_size
  *
- * Returns: see @nx842_powernv_exec()
+ * Returns: see @nx842_powernv_function()
  */
 static int nx842_powernv_compress(const unsigned char *in, unsigned int inlen,
                                  unsigned char *out, unsigned int *outlenp,
                                  void *wmem)
 {
-       return nx842_powernv_exec(in, inlen, out, outlenp,
+       return nx842_powernv_function(in, inlen, out, outlenp,
                                      wmem, CCW_FC_842_COMP_CRC);
 }
 
@@ -521,13 +517,13 @@ static int nx842_powernv_compress(const unsigned char *in, unsigned int inlen,
  * @workmem: working memory buffer pointer, size determined by
  *           nx842_powernv_driver.workmem_size
  *
- * Returns: see @nx842_powernv_exec()
+ * Returns: see @nx842_powernv_function()
  */
 static int nx842_powernv_decompress(const unsigned char *in, unsigned int inlen,
                                    unsigned char *out, unsigned int *outlenp,
                                    void *wmem)
 {
-       return nx842_powernv_exec(in, inlen, out, outlenp,
+       return nx842_powernv_function(in, inlen, out, outlenp,
                                      wmem, CCW_FC_842_DECOMP_CRC);
 }
 
@@ -629,8 +625,6 @@ static __init int nx842_powernv_init(void)
        if (!nx842_ct)
                return -ENODEV;
 
-       nx842_powernv_exec = nx842_exec_icswx;
-
        ret = crypto_register_alg(&nx842_powernv_alg);
        if (ret) {
                struct nx842_coproc *coproc, *n;