Merge tag 'gvt-fixes-2019-03-21' of https://github.com/intel/gvt-linux into drm-intel...

[linux-2.6-microblaze.git] / drivers / scsi / fnic / fnic_debugfs.c

diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
index 139fffa..21991c9 100644 (file)
--- a/drivers/scsi/fnic/fnic_debugfs.c
+++ b/drivers/scsi/fnic/fnic_debugfs.c
@@ -54,23 +54,9 @@ int fnic_debugfs_init(void)
 {
        int rc = -1;
        fnic_trace_debugfs_root = debugfs_create_dir("fnic", NULL);
-       if (!fnic_trace_debugfs_root) {
-               printk(KERN_DEBUG "Cannot create debugfs root\n");
-               return rc;
-       }
-
-       if (!fnic_trace_debugfs_root) {
-               printk(KERN_DEBUG
-                       "fnic root directory doesn't exist in debugfs\n");
-               return rc;
-       }
 
        fnic_stats_debugfs_root = debugfs_create_dir("statistics",
                                                fnic_trace_debugfs_root);
-       if (!fnic_stats_debugfs_root) {
-               printk(KERN_DEBUG "Cannot create Statistics directory\n");
-               return rc;
-       }
 
        /* Allocate memory to structure */
        fc_trc_flag = (struct fc_trace_flag_type *)
@@ -356,39 +342,19 @@ static const struct file_operations fnic_trace_debugfs_fops = {
  * it will also create file trace_enable to control enable/disable of
  * trace logging into trace buffer.
  */
-int fnic_trace_debugfs_init(void)
+void fnic_trace_debugfs_init(void)
 {
-       int rc = -1;
-       if (!fnic_trace_debugfs_root) {
-               printk(KERN_DEBUG
-                       "FNIC Debugfs root directory doesn't exist\n");
-               return rc;
-       }
        fnic_trace_enable = debugfs_create_file("tracing_enable",
                                        S_IFREG|S_IRUGO|S_IWUSR,
                                        fnic_trace_debugfs_root,
                                        &(fc_trc_flag->fnic_trace),
                                        &fnic_trace_ctrl_fops);
 
-       if (!fnic_trace_enable) {
-               printk(KERN_DEBUG
-                       "Cannot create trace_enable file under debugfs\n");
-               return rc;
-       }
-
        fnic_trace_debugfs_file = debugfs_create_file("trace",
                                        S_IFREG|S_IRUGO|S_IWUSR,
                                        fnic_trace_debugfs_root,
                                        &(fc_trc_flag->fnic_trace),
                                        &fnic_trace_debugfs_fops);
-
-       if (!fnic_trace_debugfs_file) {
-               printk(KERN_DEBUG
-                       "Cannot create trace file under debugfs\n");
-               return rc;
-       }
-       rc = 0;
-       return rc;
 }
 
 /*
@@ -419,37 +385,20 @@ void fnic_trace_debugfs_terminate(void)
  * trace logging into trace buffer.
  */
 
-int fnic_fc_trace_debugfs_init(void)
+void fnic_fc_trace_debugfs_init(void)
 {
-       int rc = -1;
-
-       if (!fnic_trace_debugfs_root) {
-               pr_err("fnic:Debugfs root directory doesn't exist\n");
-               return rc;
-       }
-
        fnic_fc_trace_enable = debugfs_create_file("fc_trace_enable",
                                        S_IFREG|S_IRUGO|S_IWUSR,
                                        fnic_trace_debugfs_root,
                                        &(fc_trc_flag->fc_trace),
                                        &fnic_trace_ctrl_fops);
 
-       if (!fnic_fc_trace_enable) {
-               pr_err("fnic: Failed create fc_trace_enable file\n");
-               return rc;
-       }
-
        fnic_fc_trace_clear = debugfs_create_file("fc_trace_clear",
                                        S_IFREG|S_IRUGO|S_IWUSR,
                                        fnic_trace_debugfs_root,
                                        &(fc_trc_flag->fc_clear),
                                        &fnic_trace_ctrl_fops);
 
-       if (!fnic_fc_trace_clear) {
-               pr_err("fnic: Failed to create fc_trace_enable file\n");
-               return rc;
-       }
-
        fnic_fc_rdata_trace_debugfs_file =
                debugfs_create_file("fc_trace_rdata",
                                    S_IFREG|S_IRUGO|S_IWUSR,
@@ -457,24 +406,12 @@ int fnic_fc_trace_debugfs_init(void)
                                    &(fc_trc_flag->fc_normal_file),
                                    &fnic_trace_debugfs_fops);
 
-       if (!fnic_fc_rdata_trace_debugfs_file) {
-               pr_err("fnic: Failed create fc_rdata_trace file\n");
-               return rc;
-       }
-
        fnic_fc_trace_debugfs_file =
                debugfs_create_file("fc_trace",
                                    S_IFREG|S_IRUGO|S_IWUSR,
                                    fnic_trace_debugfs_root,
                                    &(fc_trc_flag->fc_row_file),
                                    &fnic_trace_debugfs_fops);
-
-       if (!fnic_fc_trace_debugfs_file) {
-               pr_err("fnic: Failed to create fc_trace file\n");
-               return rc;
-       }
-       rc = 0;
-       return rc;
 }
 
 /*
@@ -757,45 +694,26 @@ static const struct file_operations fnic_reset_debugfs_fops = {
  * It will create file stats and reset_stats under statistics/host# directory
  * to log per fnic stats.
  */
-int fnic_stats_debugfs_init(struct fnic *fnic)
+void fnic_stats_debugfs_init(struct fnic *fnic)
 {
-       int rc = -1;
        char name[16];
 
        snprintf(name, sizeof(name), "host%d", fnic->lport->host->host_no);
 
-       if (!fnic_stats_debugfs_root) {
-               printk(KERN_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) {
-               printk(KERN_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) {
-               printk(KERN_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) {
-               printk(KERN_DEBUG "Cannot create host stats file\n");
-               return rc;
-       }
-       rc = 0;
-       return rc;
 }
 
 /*