i40e: debugfs fixups
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Sat, 28 Sep 2013 07:13:33 +0000 (07:13 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 22 Oct 2013 12:49:20 +0000 (05:49 -0700)
debugfs fixes for issues found by coverity.

This issue was identified by the coverity checker, reported by Hannes Frederic
Sowa.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Hannes Frederic Sowa <hannes@stressinduktion.org>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_debugfs.c

index 19e248ff6c77c6cb6e615910dcba552f5b170038..304f39d4eb369883134865109645f01b622f6662 100644 (file)
@@ -2019,21 +2019,35 @@ static const struct file_operations i40e_dbg_netdev_ops_fops = {
  **/
 void i40e_dbg_pf_init(struct i40e_pf *pf)
 {
-       struct dentry *pfile __attribute__((unused));
+       struct dentry *pfile;
        const char *name = pci_name(pf->pdev);
+       const struct device *dev = &pf->pdev->dev;
 
        pf->i40e_dbg_pf = debugfs_create_dir(name, i40e_dbg_root);
-       if (pf->i40e_dbg_pf) {
-               pfile = debugfs_create_file("command", 0600, pf->i40e_dbg_pf,
-                                           pf, &i40e_dbg_command_fops);
-               pfile = debugfs_create_file("dump", 0600, pf->i40e_dbg_pf, pf,
-                                           &i40e_dbg_dump_fops);
-               pfile = debugfs_create_file("netdev_ops", 0600, pf->i40e_dbg_pf,
-                                           pf, &i40e_dbg_netdev_ops_fops);
-       } else {
-               dev_info(&pf->pdev->dev,
-                        "debugfs entry for %s failed\n", name);
-       }
+       if (!pf->i40e_dbg_pf)
+               return;
+
+       pfile = debugfs_create_file("command", 0600, pf->i40e_dbg_pf, pf,
+                                   &i40e_dbg_command_fops);
+       if (!pfile)
+               goto create_failed;
+
+       pfile = debugfs_create_file("dump", 0600, pf->i40e_dbg_pf, pf,
+                                   &i40e_dbg_dump_fops);
+       if (!pfile)
+               goto create_failed;
+
+       pfile = debugfs_create_file("netdev_ops", 0600, pf->i40e_dbg_pf, pf,
+                                   &i40e_dbg_netdev_ops_fops);
+       if (!pfile)
+               goto create_failed;
+
+       return;
+
+create_failed:
+       dev_info(dev, "debugfs dir/file for %s failed\n", name);
+       debugfs_remove_recursive(pf->i40e_dbg_pf);
+       return;
 }
 
 /**