Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...

[linux-2.6-block.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_debugfs.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
index 55fe8114fe99ef8aa68f5289c892dc8767078315..50dfb02fa34cd46210ab5644fc57adef856e348e 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
@@ -10,15 +10,9 @@ static struct dentry *ixgbe_dbg_root;
 
 static char ixgbe_dbg_reg_ops_buf[256] = "";
 
-/**
- * ixgbe_dbg_reg_ops_read - read for reg_ops datum
- * @filp: the opened file
- * @buffer: where to write the data for the user to read
- * @count: the size of the user's buffer
- * @ppos: file position offset
- **/
-static ssize_t ixgbe_dbg_reg_ops_read(struct file *filp, char __user *buffer,
-                                   size_t count, loff_t *ppos)
+static ssize_t ixgbe_dbg_common_ops_read(struct file *filp, char __user *buffer,
+                                        size_t count, loff_t *ppos,
+                                        char *dbg_buf)
 {
        struct ixgbe_adapter *adapter = filp->private_data;
        char *buf;
@@ -29,8 +23,7 @@ static ssize_t ixgbe_dbg_reg_ops_read(struct file *filp, char __user *buffer,
                return 0;
 
        buf = kasprintf(GFP_KERNEL, "%s: %s\n",
-                       adapter->netdev->name,
-                       ixgbe_dbg_reg_ops_buf);
+                       adapter->netdev->name, dbg_buf);
        if (!buf)
                return -ENOMEM;
 
@@ -45,6 +38,20 @@ static ssize_t ixgbe_dbg_reg_ops_read(struct file *filp, char __user *buffer,
        return len;
 }
 
+/**
+ * ixgbe_dbg_reg_ops_read - read for reg_ops datum
+ * @filp: the opened file
+ * @buffer: where to write the data for the user to read
+ * @count: the size of the user's buffer
+ * @ppos: file position offset
+ **/
+static ssize_t ixgbe_dbg_reg_ops_read(struct file *filp, char __user *buffer,
+                                     size_t count, loff_t *ppos)
+{
+       return ixgbe_dbg_common_ops_read(filp, buffer, count, ppos,
+                                        ixgbe_dbg_reg_ops_buf);
+}
+
 /**
  * ixgbe_dbg_reg_ops_write - write into reg_ops datum
  * @filp: the opened file
@@ -121,33 +128,11 @@ static char ixgbe_dbg_netdev_ops_buf[256] = "";
  * @count: the size of the user's buffer
  * @ppos: file position offset
  **/
-static ssize_t ixgbe_dbg_netdev_ops_read(struct file *filp,
-                                        char __user *buffer,
+static ssize_t ixgbe_dbg_netdev_ops_read(struct file *filp, char __user *buffer,
                                         size_t count, loff_t *ppos)
 {
-       struct ixgbe_adapter *adapter = filp->private_data;
-       char *buf;
-       int len;
-
-       /* don't allow partial reads */
-       if (*ppos != 0)
-               return 0;
-
-       buf = kasprintf(GFP_KERNEL, "%s: %s\n",
-                       adapter->netdev->name,
-                       ixgbe_dbg_netdev_ops_buf);
-       if (!buf)
-               return -ENOMEM;
-
-       if (count < strlen(buf)) {
-               kfree(buf);
-               return -ENOSPC;
-       }
-
-       len = simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
-
-       kfree(buf);
-       return len;
+       return ixgbe_dbg_common_ops_read(filp, buffer, count, ppos,
+                                        ixgbe_dbg_netdev_ops_buf);
 }
 
 /**