crypto: nx - no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Also, there is no need to store the individual debugfs file names,
especially as the whole directiry is deleted at once, so remove the
unneeded structure entirely.

Cc: "Breno Leitão" <leitao@debian.org>
Cc: Nayna Jain <nayna@linux.ibm.com>
Cc: Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
index 3a5e31be4764db30bfd257f6262a325c6a0ebf6a..20b5e276f184a17da95a7a3af54ea57705843cc5 100644 (file)
--- a/drivers/crypto/nx/nx.c
+++ b/drivers/crypto/nx/nx.c
@@ -581,9 +581,7 @@ static int nx_register_algs(void)
 
        memset(&nx_driver.stats, 0, sizeof(struct nx_stats));
 
-       rc = NX_DEBUGFS_INIT(&nx_driver);
-       if (rc)
-               goto out;
+       NX_DEBUGFS_INIT(&nx_driver);
 
        nx_driver.of.status = NX_OKAY;
 

diff --git a/drivers/crypto/nx/nx.h b/drivers/crypto/nx/nx.h
index c3e54af18645c930220ae2801525ff490c89704b..c6b5a3be02be604e6eeb554944bfdb6baf995ce1 100644 (file)
--- a/drivers/crypto/nx/nx.h
+++ b/drivers/crypto/nx/nx.h
@@ -76,20 +76,12 @@ struct nx_stats {
        atomic_t last_error_pid;
 };
 
-struct nx_debugfs {
-       struct dentry *dfs_root;
-       struct dentry *dfs_aes_ops, *dfs_aes_bytes;
-       struct dentry *dfs_sha256_ops, *dfs_sha256_bytes;
-       struct dentry *dfs_sha512_ops, *dfs_sha512_bytes;
-       struct dentry *dfs_errors, *dfs_last_error, *dfs_last_error_pid;
-};
-
 struct nx_crypto_driver {
        struct nx_stats    stats;
        struct nx_of       of;
        struct vio_dev    *viodev;
        struct vio_driver  viodriver;
-       struct nx_debugfs  dfs;
+       struct dentry     *dfs_root;
 };
 
 #define NX_GCM4106_NONCE_LEN           (4)
@@ -177,7 +169,7 @@ struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int,
 #define NX_DEBUGFS_INIT(drv)   nx_debugfs_init(drv)
 #define NX_DEBUGFS_FINI(drv)   nx_debugfs_fini(drv)
 
-int nx_debugfs_init(struct nx_crypto_driver *);
+void nx_debugfs_init(struct nx_crypto_driver *);
 void nx_debugfs_fini(struct nx_crypto_driver *);
 #else
 #define NX_DEBUGFS_INIT(drv)   (0)

diff --git a/drivers/crypto/nx/nx_debugfs.c b/drivers/crypto/nx/nx_debugfs.c
index 7ab2e8dcd9b42797fff8ad4f637989751f6004b8..add1d8d0d23cc0cec8fa424eabb70ab296b0b42d 100644 (file)
--- a/drivers/crypto/nx/nx_debugfs.c
+++ b/drivers/crypto/nx/nx_debugfs.c
@@ -42,62 +42,37 @@
  * Documentation/ABI/testing/debugfs-pfo-nx-crypto
  */
 
-int nx_debugfs_init(struct nx_crypto_driver *drv)
+void nx_debugfs_init(struct nx_crypto_driver *drv)
 {
-       struct nx_debugfs *dfs = &drv->dfs;
+       struct dentry *root;
 
-       dfs->dfs_root = debugfs_create_dir(NX_NAME, NULL);
+       root = debugfs_create_dir(NX_NAME, NULL);
+       drv->dfs_root = root;
 
-       dfs->dfs_aes_ops =
-               debugfs_create_u32("aes_ops",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root, (u32 *)&drv->stats.aes_ops);
-       dfs->dfs_sha256_ops =
-               debugfs_create_u32("sha256_ops",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root,
-                                  (u32 *)&drv->stats.sha256_ops);
-       dfs->dfs_sha512_ops =
-               debugfs_create_u32("sha512_ops",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root,
-                                  (u32 *)&drv->stats.sha512_ops);
-       dfs->dfs_aes_bytes =
-               debugfs_create_u64("aes_bytes",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root,
-                                  (u64 *)&drv->stats.aes_bytes);
-       dfs->dfs_sha256_bytes =
-               debugfs_create_u64("sha256_bytes",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root,
-                                  (u64 *)&drv->stats.sha256_bytes);
-       dfs->dfs_sha512_bytes =
-               debugfs_create_u64("sha512_bytes",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root,
-                                  (u64 *)&drv->stats.sha512_bytes);
-       dfs->dfs_errors =
-               debugfs_create_u32("errors",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root, (u32 *)&drv->stats.errors);
-       dfs->dfs_last_error =
-               debugfs_create_u32("last_error",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root,
-                                  (u32 *)&drv->stats.last_error);
-       dfs->dfs_last_error_pid =
-               debugfs_create_u32("last_error_pid",
-                                  S_IRUSR | S_IRGRP | S_IROTH,
-                                  dfs->dfs_root,
-                                  (u32 *)&drv->stats.last_error_pid);
-       return 0;
+       debugfs_create_u32("aes_ops", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u32 *)&drv->stats.aes_ops);
+       debugfs_create_u32("sha256_ops", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u32 *)&drv->stats.sha256_ops);
+       debugfs_create_u32("sha512_ops", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u32 *)&drv->stats.sha512_ops);
+       debugfs_create_u64("aes_bytes", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u64 *)&drv->stats.aes_bytes);
+       debugfs_create_u64("sha256_bytes", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u64 *)&drv->stats.sha256_bytes);
+       debugfs_create_u64("sha512_bytes", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u64 *)&drv->stats.sha512_bytes);
+       debugfs_create_u32("errors", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u32 *)&drv->stats.errors);
+       debugfs_create_u32("last_error", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u32 *)&drv->stats.last_error);
+       debugfs_create_u32("last_error_pid", S_IRUSR | S_IRGRP | S_IROTH,
+                          root, (u32 *)&drv->stats.last_error_pid);
 }
 
 void
 nx_debugfs_fini(struct nx_crypto_driver *drv)
 {
-       debugfs_remove_recursive(drv->dfs.dfs_root);
+       debugfs_remove_recursive(drv->dfs_root);
 }
 
 #endif