| Message ID | a5c237cd-449b-4f9d-bcff-6285fb7c28d1@stanley.mountain |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: fnic: delete incorrect debugfs error handling | expand |
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
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; } /*
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(-)