* [PATCH] scsi: fnic: delete incorrect debugfs error handling
@ 2025-01-07 13:35 Dan Carpenter
2025-01-08 2:53 ` Karan Tilak Kumar (kartilak)
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2025-01-07 13:35 UTC (permalink / raw)
To: Karan Tilak Kumar
Cc: Sesidhar Baddela, James E.J. Bottomley, Martin K. Petersen,
linux-scsi, linux-kernel, kernel-janitors
Debugfs functions are not supposed to require error checking and,
in fact, adding checks would normally lead to the driver refusing to load
when CONFIG_DEBUGFS is disabled.
What saves us here is that this code checks for NULL instead of
error pointers so the error checking is all dead code. Delete it.
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/scsi/fnic/fnic_debugfs.c | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
index caee32bc9190..5767862ae42f 100644
--- a/drivers/scsi/fnic/fnic_debugfs.c
+++ b/drivers/scsi/fnic/fnic_debugfs.c
@@ -679,46 +679,23 @@ static const struct file_operations fnic_reset_debugfs_fops = {
*/
int fnic_stats_debugfs_init(struct fnic *fnic)
{
- int rc = -1;
char name[16];
snprintf(name, sizeof(name), "host%d", fnic->host->host_no);
- if (!fnic_stats_debugfs_root) {
- pr_debug("fnic_stats root doesn't exist\n");
- return rc;
- }
-
fnic->fnic_stats_debugfs_host = debugfs_create_dir(name,
fnic_stats_debugfs_root);
-
- if (!fnic->fnic_stats_debugfs_host) {
- pr_debug("Cannot create host directory\n");
- return rc;
- }
-
fnic->fnic_stats_debugfs_file = debugfs_create_file("stats",
S_IFREG|S_IRUGO|S_IWUSR,
fnic->fnic_stats_debugfs_host,
fnic,
&fnic_stats_debugfs_fops);
-
- if (!fnic->fnic_stats_debugfs_file) {
- pr_debug("Cannot create host stats file\n");
- return rc;
- }
-
fnic->fnic_reset_debugfs_file = debugfs_create_file("reset_stats",
S_IFREG|S_IRUGO|S_IWUSR,
fnic->fnic_stats_debugfs_host,
fnic,
&fnic_reset_debugfs_fops);
- if (!fnic->fnic_reset_debugfs_file) {
- pr_debug("Cannot create host stats file\n");
- return rc;
- }
- rc = 0;
- return rc;
+ return 0;
}
/*
--
2.45.2
^ permalink raw reply [flat|nested] 2+ messages in thread* RE: [PATCH] scsi: fnic: delete incorrect debugfs error handling
2025-01-07 13:35 [PATCH] scsi: fnic: delete incorrect debugfs error handling Dan Carpenter
@ 2025-01-08 2:53 ` Karan Tilak Kumar (kartilak)
0 siblings, 0 replies; 2+ messages in thread
From: Karan Tilak Kumar (kartilak) @ 2025-01-08 2:53 UTC (permalink / raw)
To: Dan Carpenter
Cc: Sesidhar Baddela (sebaddel),
James E.J. Bottomley, Martin K. Petersen, linux-scsi,
linux-kernel, kernel-janitors
On Tuesday, January 7, 2025 5:35 AM, Dan Carpenter <dan.carpenter@linaro.org> wrote:
>
> Debugfs functions are not supposed to require error checking and,
> in fact, adding checks would normally lead to the driver refusing to load
> when CONFIG_DEBUGFS is disabled.
>
> What saves us here is that this code checks for NULL instead of
> error pointers so the error checking is all dead code. Delete it.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/scsi/fnic/fnic_debugfs.c | 25 +------------------------
> 1 file changed, 1 insertion(+), 24 deletions(-)
>
> diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
> index caee32bc9190..5767862ae42f 100644
> --- a/drivers/scsi/fnic/fnic_debugfs.c
> +++ b/drivers/scsi/fnic/fnic_debugfs.c
> @@ -679,46 +679,23 @@ static const struct file_operations fnic_reset_debugfs_fops = {
> */
> int fnic_stats_debugfs_init(struct fnic *fnic)
> {
> - int rc = -1;
> char name[16];
>
> snprintf(name, sizeof(name), "host%d", fnic->host->host_no);
>
> - if (!fnic_stats_debugfs_root) {
> - pr_debug("fnic_stats root doesn't exist\n");
> - return rc;
> - }
> -
> fnic->fnic_stats_debugfs_host = debugfs_create_dir(name,
> fnic_stats_debugfs_root);
> -
> - if (!fnic->fnic_stats_debugfs_host) {
> - pr_debug("Cannot create host directory\n");
> - return rc;
> - }
> -
> fnic->fnic_stats_debugfs_file = debugfs_create_file("stats",
> S_IFREG|S_IRUGO|S_IWUSR,
> fnic->fnic_stats_debugfs_host,
> fnic,
> &fnic_stats_debugfs_fops);
> -
> - if (!fnic->fnic_stats_debugfs_file) {
> - pr_debug("Cannot create host stats file\n");
> - return rc;
> - }
> -
> fnic->fnic_reset_debugfs_file = debugfs_create_file("reset_stats",
> S_IFREG|S_IRUGO|S_IWUSR,
> fnic->fnic_stats_debugfs_host,
> fnic,
> &fnic_reset_debugfs_fops);
> - if (!fnic->fnic_reset_debugfs_file) {
> - pr_debug("Cannot create host stats file\n");
> - return rc;
> - }
> - rc = 0;
> - return rc;
> + return 0;
> }
>
> /*
> --
> 2.45.2
>
>
Changes look good. Thanks for these changes.
Reviewed-by: Karan Tilak Kumar <kartilak@cisco.com>
Regards,
Karan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-08 2:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-07 13:35 [PATCH] scsi: fnic: delete incorrect debugfs error handling Dan Carpenter
2025-01-08 2:53 ` Karan Tilak Kumar (kartilak)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®