Commit 576d152c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Herbert Xu

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 97a5fee2
...@@ -581,9 +581,7 @@ static int nx_register_algs(void) ...@@ -581,9 +581,7 @@ static int nx_register_algs(void)
memset(&nx_driver.stats, 0, sizeof(struct nx_stats)); memset(&nx_driver.stats, 0, sizeof(struct nx_stats));
rc = NX_DEBUGFS_INIT(&nx_driver); NX_DEBUGFS_INIT(&nx_driver);
if (rc)
goto out;
nx_driver.of.status = NX_OKAY; nx_driver.of.status = NX_OKAY;
......
...@@ -76,20 +76,12 @@ struct nx_stats { ...@@ -76,20 +76,12 @@ struct nx_stats {
atomic_t last_error_pid; 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_crypto_driver {
struct nx_stats stats; struct nx_stats stats;
struct nx_of of; struct nx_of of;
struct vio_dev *viodev; struct vio_dev *viodev;
struct vio_driver viodriver; struct vio_driver viodriver;
struct nx_debugfs dfs; struct dentry *dfs_root;
}; };
#define NX_GCM4106_NONCE_LEN (4) #define NX_GCM4106_NONCE_LEN (4)
...@@ -177,7 +169,7 @@ struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int, ...@@ -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_INIT(drv) nx_debugfs_init(drv)
#define NX_DEBUGFS_FINI(drv) nx_debugfs_fini(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 *); void nx_debugfs_fini(struct nx_crypto_driver *);
#else #else
#define NX_DEBUGFS_INIT(drv) (0) #define NX_DEBUGFS_INIT(drv) (0)
......
...@@ -42,62 +42,37 @@ ...@@ -42,62 +42,37 @@
* Documentation/ABI/testing/debugfs-pfo-nx-crypto * 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,
debugfs_create_u32("aes_ops", root, (u32 *)&drv->stats.aes_ops);
S_IRUSR | S_IRGRP | S_IROTH, debugfs_create_u32("sha256_ops", S_IRUSR | S_IRGRP | S_IROTH,
dfs->dfs_root, (u32 *)&drv->stats.aes_ops); root, (u32 *)&drv->stats.sha256_ops);
dfs->dfs_sha256_ops = debugfs_create_u32("sha512_ops", S_IRUSR | S_IRGRP | S_IROTH,
debugfs_create_u32("sha256_ops", root, (u32 *)&drv->stats.sha512_ops);
S_IRUSR | S_IRGRP | S_IROTH, debugfs_create_u64("aes_bytes", S_IRUSR | S_IRGRP | S_IROTH,
dfs->dfs_root, root, (u64 *)&drv->stats.aes_bytes);
(u32 *)&drv->stats.sha256_ops); debugfs_create_u64("sha256_bytes", S_IRUSR | S_IRGRP | S_IROTH,
dfs->dfs_sha512_ops = root, (u64 *)&drv->stats.sha256_bytes);
debugfs_create_u32("sha512_ops", debugfs_create_u64("sha512_bytes", S_IRUSR | S_IRGRP | S_IROTH,
S_IRUSR | S_IRGRP | S_IROTH, root, (u64 *)&drv->stats.sha512_bytes);
dfs->dfs_root, debugfs_create_u32("errors", S_IRUSR | S_IRGRP | S_IROTH,
(u32 *)&drv->stats.sha512_ops); root, (u32 *)&drv->stats.errors);
dfs->dfs_aes_bytes = debugfs_create_u32("last_error", S_IRUSR | S_IRGRP | S_IROTH,
debugfs_create_u64("aes_bytes", root, (u32 *)&drv->stats.last_error);
S_IRUSR | S_IRGRP | S_IROTH, debugfs_create_u32("last_error_pid", S_IRUSR | S_IRGRP | S_IROTH,
dfs->dfs_root, root, (u32 *)&drv->stats.last_error_pid);
(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;
} }
void void
nx_debugfs_fini(struct nx_crypto_driver *drv) nx_debugfs_fini(struct nx_crypto_driver *drv)
{ {
debugfs_remove_recursive(drv->dfs.dfs_root); debugfs_remove_recursive(drv->dfs_root);
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment