crypto: user - rename err_cnt parameter

Since now all crypto stats are on their own structures, it is now
useless to have the algorithm name in the err_cnt member.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

2 files changed, 28 insertions, 28 deletions

diff --git a/crypto/algapi.c b/crypto/algapi.c
index a8cb5aed0069..c0d4f9ef6b0f 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -1083,7 +1083,7 @@ void crypto_stats_ablkcipher_encrypt(unsigned int nbytes, int ret,
                                      struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+                atomic64_inc(&alg->stats.cipher.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.cipher.encrypt_cnt);
                 atomic64_add(nbytes, &alg->stats.cipher.encrypt_tlen);
@@ -1096,7 +1096,7 @@ void crypto_stats_ablkcipher_decrypt(unsigned int nbytes, int ret,
                                      struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+                atomic64_inc(&alg->stats.cipher.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.cipher.decrypt_cnt);
                 atomic64_add(nbytes, &alg->stats.cipher.decrypt_tlen);
@@ -1109,7 +1109,7 @@ void crypto_stats_aead_encrypt(unsigned int cryptlen, struct crypto_alg *alg,
                                int ret)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.aead.aead_err_cnt);
+                atomic64_inc(&alg->stats.aead.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.aead.encrypt_cnt);
                 atomic64_add(cryptlen, &alg->stats.aead.encrypt_tlen);
@@ -1122,7 +1122,7 @@ void crypto_stats_aead_decrypt(unsigned int cryptlen, struct crypto_alg *alg,
                                int ret)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.aead.aead_err_cnt);
+                atomic64_inc(&alg->stats.aead.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.aead.decrypt_cnt);
                 atomic64_add(cryptlen, &alg->stats.aead.decrypt_tlen);
@@ -1135,7 +1135,7 @@ void crypto_stats_akcipher_encrypt(unsigned int src_len, int ret,
                                    struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+                atomic64_inc(&alg->stats.akcipher.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.akcipher.encrypt_cnt);
                 atomic64_add(src_len, &alg->stats.akcipher.encrypt_tlen);
@@ -1148,7 +1148,7 @@ void crypto_stats_akcipher_decrypt(unsigned int src_len, int ret,
                                    struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+                atomic64_inc(&alg->stats.akcipher.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.akcipher.decrypt_cnt);
                 atomic64_add(src_len, &alg->stats.akcipher.decrypt_tlen);
@@ -1160,7 +1160,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_akcipher_decrypt);
 void crypto_stats_akcipher_sign(int ret, struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-                atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+                atomic64_inc(&alg->stats.akcipher.err_cnt);
         else
                 atomic64_inc(&alg->stats.akcipher.sign_cnt);
         crypto_alg_put(alg);
@@ -1170,7 +1170,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_akcipher_sign);
 void crypto_stats_akcipher_verify(int ret, struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-                atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+                atomic64_inc(&alg->stats.akcipher.err_cnt);
         else
                 atomic64_inc(&alg->stats.akcipher.verify_cnt);
         crypto_alg_put(alg);
@@ -1180,7 +1180,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_akcipher_verify);
 void crypto_stats_compress(unsigned int slen, int ret, struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.compress.compress_err_cnt);
+                atomic64_inc(&alg->stats.compress.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.compress.compress_cnt);
                 atomic64_add(slen, &alg->stats.compress.compress_tlen);
@@ -1192,7 +1192,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_compress);
 void crypto_stats_decompress(unsigned int slen, int ret, struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.compress.compress_err_cnt);
+                atomic64_inc(&alg->stats.compress.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.compress.decompress_cnt);
                 atomic64_add(slen, &alg->stats.compress.decompress_tlen);
@@ -1205,7 +1205,7 @@ void crypto_stats_ahash_update(unsigned int nbytes, int ret,
                                struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-                atomic64_inc(&alg->stats.hash.hash_err_cnt);
+                atomic64_inc(&alg->stats.hash.err_cnt);
         else
                 atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
         crypto_alg_put(alg);
@@ -1216,7 +1216,7 @@ void crypto_stats_ahash_final(unsigned int nbytes, int ret,
                               struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.hash.hash_err_cnt);
+                atomic64_inc(&alg->stats.hash.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.hash.hash_cnt);
                 atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
@@ -1228,7 +1228,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_ahash_final);
 void crypto_stats_kpp_set_secret(struct crypto_alg *alg, int ret)
 {
         if (ret)
-                atomic64_inc(&alg->stats.kpp.kpp_err_cnt);
+                atomic64_inc(&alg->stats.kpp.err_cnt);
         else
                 atomic64_inc(&alg->stats.kpp.setsecret_cnt);
         crypto_alg_put(alg);
@@ -1238,7 +1238,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_kpp_set_secret);
 void crypto_stats_kpp_generate_public_key(struct crypto_alg *alg, int ret)
 {
         if (ret)
-                atomic64_inc(&alg->stats.kpp.kpp_err_cnt);
+                atomic64_inc(&alg->stats.kpp.err_cnt);
         else
                 atomic64_inc(&alg->stats.kpp.generate_public_key_cnt);
         crypto_alg_put(alg);
@@ -1248,7 +1248,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_kpp_generate_public_key);
 void crypto_stats_kpp_compute_shared_secret(struct crypto_alg *alg, int ret)
 {
         if (ret)
-                atomic64_inc(&alg->stats.kpp.kpp_err_cnt);
+                atomic64_inc(&alg->stats.kpp.err_cnt);
         else
                 atomic64_inc(&alg->stats.kpp.compute_shared_secret_cnt);
         crypto_alg_put(alg);
@@ -1258,7 +1258,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_kpp_compute_shared_secret);
 void crypto_stats_rng_seed(struct crypto_alg *alg, int ret)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-                atomic64_inc(&alg->stats.rng.rng_err_cnt);
+                atomic64_inc(&alg->stats.rng.err_cnt);
         else
                 atomic64_inc(&alg->stats.rng.seed_cnt);
         crypto_alg_put(alg);
@@ -1269,7 +1269,7 @@ void crypto_stats_rng_generate(struct crypto_alg *alg, unsigned int dlen,
                                int ret)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.rng.rng_err_cnt);
+                atomic64_inc(&alg->stats.rng.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.rng.generate_cnt);
                 atomic64_add(dlen, &alg->stats.rng.generate_tlen);
@@ -1282,7 +1282,7 @@ void crypto_stats_skcipher_encrypt(unsigned int cryptlen, int ret,
                                    struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+                atomic64_inc(&alg->stats.cipher.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.cipher.encrypt_cnt);
                 atomic64_add(cryptlen, &alg->stats.cipher.encrypt_tlen);
@@ -1295,7 +1295,7 @@ void crypto_stats_skcipher_decrypt(unsigned int cryptlen, int ret,
                                    struct crypto_alg *alg)
 {
         if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-                atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+                atomic64_inc(&alg->stats.cipher.err_cnt);
         } else {
                 atomic64_inc(&alg->stats.cipher.decrypt_cnt);
                 atomic64_add(cryptlen, &alg->stats.cipher.decrypt_tlen);
diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c
index 113bf1691560..0ba00aaeb810 100644
--- a/crypto/crypto_user_stat.c
+++ b/crypto/crypto_user_stat.c
@@ -43,7 +43,7 @@ static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)
         raead.stat_encrypt_tlen = atomic64_read(&alg->stats.aead.encrypt_tlen);
         raead.stat_decrypt_cnt = atomic64_read(&alg->stats.aead.decrypt_cnt);
         raead.stat_decrypt_tlen = atomic64_read(&alg->stats.aead.decrypt_tlen);
-        raead.stat_aead_err_cnt = atomic64_read(&alg->stats.aead.aead_err_cnt);
+        raead.stat_err_cnt = atomic64_read(&alg->stats.aead.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_AEAD, sizeof(raead), &raead);
 }
@@ -60,7 +60,7 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
         rcipher.stat_encrypt_tlen = atomic64_read(&alg->stats.cipher.encrypt_tlen);
         rcipher.stat_decrypt_cnt =  atomic64_read(&alg->stats.cipher.decrypt_cnt);
         rcipher.stat_decrypt_tlen = atomic64_read(&alg->stats.cipher.decrypt_tlen);
-        rcipher.stat_cipher_err_cnt =  atomic64_read(&alg->stats.cipher.cipher_err_cnt);
+        rcipher.stat_err_cnt =  atomic64_read(&alg->stats.cipher.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_CIPHER, sizeof(rcipher), &rcipher);
 }
@@ -76,7 +76,7 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
         rcomp.stat_compress_tlen = atomic64_read(&alg->stats.compress.compress_tlen);
         rcomp.stat_decompress_cnt = atomic64_read(&alg->stats.compress.decompress_cnt);
         rcomp.stat_decompress_tlen = atomic64_read(&alg->stats.compress.decompress_tlen);
-        rcomp.stat_compress_err_cnt = atomic64_read(&alg->stats.compress.compress_err_cnt);
+        rcomp.stat_err_cnt = atomic64_read(&alg->stats.compress.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_COMPRESS, sizeof(rcomp), &rcomp);
 }
@@ -92,7 +92,7 @@ static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
         racomp.stat_compress_tlen = atomic64_read(&alg->stats.compress.compress_tlen);
         racomp.stat_decompress_cnt =  atomic64_read(&alg->stats.compress.decompress_cnt);
         racomp.stat_decompress_tlen = atomic64_read(&alg->stats.compress.decompress_tlen);
-        racomp.stat_compress_err_cnt = atomic64_read(&alg->stats.compress.compress_err_cnt);
+        racomp.stat_err_cnt = atomic64_read(&alg->stats.compress.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_ACOMP, sizeof(racomp), &racomp);
 }
@@ -110,7 +110,7 @@ static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
         rakcipher.stat_decrypt_tlen = atomic64_read(&alg->stats.akcipher.decrypt_tlen);
         rakcipher.stat_sign_cnt = atomic64_read(&alg->stats.akcipher.sign_cnt);
         rakcipher.stat_verify_cnt = atomic64_read(&alg->stats.akcipher.verify_cnt);
-        rakcipher.stat_akcipher_err_cnt = atomic64_read(&alg->stats.akcipher.akcipher_err_cnt);
+        rakcipher.stat_err_cnt = atomic64_read(&alg->stats.akcipher.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_AKCIPHER,
                        sizeof(rakcipher), &rakcipher);
@@ -127,7 +127,7 @@ static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
         rkpp.stat_setsecret_cnt = atomic64_read(&alg->stats.kpp.setsecret_cnt);
         rkpp.stat_generate_public_key_cnt = atomic64_read(&alg->stats.kpp.generate_public_key_cnt);
         rkpp.stat_compute_shared_secret_cnt = atomic64_read(&alg->stats.kpp.compute_shared_secret_cnt);
-        rkpp.stat_kpp_err_cnt = atomic64_read(&alg->stats.kpp.kpp_err_cnt);
+        rkpp.stat_err_cnt = atomic64_read(&alg->stats.kpp.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_KPP, sizeof(rkpp), &rkpp);
 }
@@ -142,7 +142,7 @@ static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)
 
         rhash.stat_hash_cnt = atomic64_read(&alg->stats.hash.hash_cnt);
         rhash.stat_hash_tlen = atomic64_read(&alg->stats.hash.hash_tlen);
-        rhash.stat_hash_err_cnt = atomic64_read(&alg->stats.hash.hash_err_cnt);
+        rhash.stat_err_cnt = atomic64_read(&alg->stats.hash.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
 }
@@ -157,7 +157,7 @@ static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)
 
         rhash.stat_hash_cnt =  atomic64_read(&alg->stats.hash.hash_cnt);
         rhash.stat_hash_tlen = atomic64_read(&alg->stats.hash.hash_tlen);
-        rhash.stat_hash_err_cnt = atomic64_read(&alg->stats.hash.hash_err_cnt);
+        rhash.stat_err_cnt = atomic64_read(&alg->stats.hash.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
 }
@@ -173,7 +173,7 @@ static int crypto_report_rng(struct sk_buff *skb, struct crypto_alg *alg)
         rrng.stat_generate_cnt = atomic64_read(&alg->stats.rng.generate_cnt);
         rrng.stat_generate_tlen = atomic64_read(&alg->stats.rng.generate_tlen);
         rrng.stat_seed_cnt = atomic64_read(&alg->stats.rng.seed_cnt);
-        rrng.stat_rng_err_cnt = atomic64_read(&alg->stats.rng.rng_err_cnt);
+        rrng.stat_err_cnt = atomic64_read(&alg->stats.rng.err_cnt);
 
         return nla_put(skb, CRYPTOCFGA_STAT_RNG, sizeof(rrng), &rrng);
 }