Merge branch 'pm-cpufreq'

[cascardo/linux.git] / drivers / crypto / nx / nx-842-powernv.c

diff --git a/drivers/crypto/nx/nx-842-powernv.c b/drivers/crypto/nx/nx-842-powernv.c
index 33b3b0a..3750e13 100644 (file)
--- a/drivers/crypto/nx/nx-842-powernv.c
+++ b/drivers/crypto/nx/nx-842-powernv.c
@@ -26,6 +26,8 @@
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Dan Streetman <ddstreet@ieee.org>");
 MODULE_DESCRIPTION("842 H/W Compression driver for IBM PowerNV processors");
+MODULE_ALIAS_CRYPTO("842");
+MODULE_ALIAS_CRYPTO("842-nx");
 
 #define WORKMEM_ALIGN  (CRB_ALIGN)
 #define CSB_WAIT_MAX   (5000) /* ms */
@@ -344,7 +346,8 @@ static int wait_for_csb(struct nx842_workmem *wmem,
        }
 
        /* successful completion */
-       pr_debug_ratelimited("Processed %u bytes in %lu us\n", csb->count,
+       pr_debug_ratelimited("Processed %u bytes in %lu us\n",
+                            be32_to_cpu(csb->count),
                             (unsigned long)ktime_us_delta(now, start));
 
        return 0;
@@ -581,9 +584,29 @@ static struct nx842_driver nx842_powernv_driver = {
        .decompress =   nx842_powernv_decompress,
 };
 
+static int nx842_powernv_crypto_init(struct crypto_tfm *tfm)
+{
+       return nx842_crypto_init(tfm, &nx842_powernv_driver);
+}
+
+static struct crypto_alg nx842_powernv_alg = {
+       .cra_name               = "842",
+       .cra_driver_name        = "842-nx",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_COMPRESS,
+       .cra_ctxsize            = sizeof(struct nx842_crypto_ctx),
+       .cra_module             = THIS_MODULE,
+       .cra_init               = nx842_powernv_crypto_init,
+       .cra_exit               = nx842_crypto_exit,
+       .cra_u                  = { .compress = {
+       .coa_compress           = nx842_crypto_compress,
+       .coa_decompress         = nx842_crypto_decompress } }
+};
+
 static __init int nx842_powernv_init(void)
 {
        struct device_node *dn;
+       int ret;
 
        /* verify workmem size/align restrictions */
        BUILD_BUG_ON(WORKMEM_ALIGN % CRB_ALIGN);
@@ -594,17 +617,14 @@ static __init int nx842_powernv_init(void)
        BUILD_BUG_ON(DDE_BUFFER_ALIGN % DDE_BUFFER_SIZE_MULT);
        BUILD_BUG_ON(DDE_BUFFER_SIZE_MULT % DDE_BUFFER_LAST_MULT);
 
-       pr_info("loading\n");
-
        for_each_compatible_node(dn, NULL, "ibm,power-nx")
                nx842_powernv_probe(dn);
 
-       if (!nx842_ct) {
-               pr_err("no coprocessors found\n");
+       if (!nx842_ct)
                return -ENODEV;
-       }
 
-       if (!nx842_platform_driver_set(&nx842_powernv_driver)) {
+       ret = crypto_register_alg(&nx842_powernv_alg);
+       if (ret) {
                struct nx842_coproc *coproc, *n;
 
                list_for_each_entry_safe(coproc, n, &nx842_coprocs, list) {
@@ -612,11 +632,9 @@ static __init int nx842_powernv_init(void)
                        kfree(coproc);
                }
 
-               return -EEXIST;
+               return ret;
        }
 
-       pr_info("loaded\n");
-
        return 0;
 }
 module_init(nx842_powernv_init);
@@ -625,13 +643,11 @@ static void __exit nx842_powernv_exit(void)
 {
        struct nx842_coproc *coproc, *n;
 
-       nx842_platform_driver_unset(&nx842_powernv_driver);
+       crypto_unregister_alg(&nx842_powernv_alg);
 
        list_for_each_entry_safe(coproc, n, &nx842_coprocs, list) {
                list_del(&coproc->list);
                kfree(coproc);
        }
-
-       pr_info("unloaded\n");
 }
 module_exit(nx842_powernv_exit);