Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / s390 / cio / qdio_debug.c

diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index e3434b3..1b78f63 100644 (file)
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -1,14 +1,12 @@
 /*
  *  drivers/s390/cio/qdio_debug.c
  *
- *  Copyright IBM Corp. 2008
+ *  Copyright IBM Corp. 2008,2009
  *
  *  Author: Jan Glauber (jang@linux.vnet.ibm.com)
  */
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
-#include <asm/qdio.h>
 #include <asm/debug.h>
 #include "qdio_debug.h"
 #include "qdio.h"
@@ -17,10 +15,7 @@ debug_info_t *qdio_dbf_setup;
 debug_info_t *qdio_dbf_error;
 
 static struct dentry *debugfs_root;
-#define MAX_DEBUGFS_QUEUES     32
-static struct dentry *debugfs_queues[MAX_DEBUGFS_QUEUES] = { NULL };
-static DEFINE_MUTEX(debugfs_mutex);
-#define QDIO_DEBUGFS_NAME_LEN  40
+#define QDIO_DEBUGFS_NAME_LEN  10
 
 void qdio_allocate_dbf(struct qdio_initialize *init_data,
                       struct qdio_irq *irq_ptr)
@@ -70,9 +65,8 @@ static int qstat_show(struct seq_file *m, void *v)
        seq_printf(m, "slsb buffer states:\n");
        seq_printf(m, "|0      |8      |16     |24     |32     |40     |48     |56  63|\n");
 
-       qdio_siga_sync_q(q);
        for (i = 0; i < QDIO_MAX_BUFFERS_PER_Q; i++) {
-               get_buf_state(q, i, &state, 0);
+               debug_get_buf_state(q, i, &state);
                switch (state) {
                case SLSB_P_INPUT_NOT_INIT:
                case SLSB_P_OUTPUT_NOT_INIT:
@@ -131,20 +125,6 @@ static int qstat_seq_open(struct inode *inode, struct file *filp)
                           filp->f_path.dentry->d_inode->i_private);
 }
 
-static void remove_debugfs_entry(struct qdio_q *q)
-{
-       int i;
-
-       for (i = 0; i < MAX_DEBUGFS_QUEUES; i++) {
-               if (!debugfs_queues[i])
-                       continue;
-               if (debugfs_queues[i]->d_inode->i_private == q) {
-                       debugfs_remove(debugfs_queues[i]);
-                       debugfs_queues[i] = NULL;
-               }
-       }
-}
-
 static struct file_operations debugfs_fops = {
        .owner   = THIS_MODULE,
        .open    = qstat_seq_open,
@@ -156,22 +136,15 @@ static struct file_operations debugfs_fops = {
 
 static void setup_debugfs_entry(struct qdio_q *q, struct ccw_device *cdev)
 {
-       int i = 0;
        char name[QDIO_DEBUGFS_NAME_LEN];
 
-       while (debugfs_queues[i] != NULL) {
-               i++;
-               if (i >= MAX_DEBUGFS_QUEUES)
-                       return;
-       }
-       snprintf(name, QDIO_DEBUGFS_NAME_LEN, "%s_%s_%d",
-                dev_name(&cdev->dev),
+       snprintf(name, QDIO_DEBUGFS_NAME_LEN, "%s_%d",
                 q->is_input_q ? "input" : "output",
                 q->nr);
-       debugfs_queues[i] = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR,
-                                               debugfs_root, q, &debugfs_fops);
-       if (IS_ERR(debugfs_queues[i]))
-               debugfs_queues[i] = NULL;
+       q->debugfs_q = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR,
+                               q->irq_ptr->debugfs_dev, q, &debugfs_fops);
+       if (IS_ERR(q->debugfs_q))
+               q->debugfs_q = NULL;
 }
 
 void qdio_setup_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev)
@@ -179,12 +152,14 @@ void qdio_setup_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev)
        struct qdio_q *q;
        int i;
 
-       mutex_lock(&debugfs_mutex);
+       irq_ptr->debugfs_dev = debugfs_create_dir(dev_name(&cdev->dev),
+                                                 debugfs_root);
+       if (IS_ERR(irq_ptr->debugfs_dev))
+               irq_ptr->debugfs_dev = NULL;
        for_each_input_queue(irq_ptr, q, i)
                setup_debugfs_entry(q, cdev);
        for_each_output_queue(irq_ptr, q, i)
                setup_debugfs_entry(q, cdev);
-       mutex_unlock(&debugfs_mutex);
 }
 
 void qdio_shutdown_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev)
@@ -192,17 +167,16 @@ void qdio_shutdown_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cd
        struct qdio_q *q;
        int i;
 
-       mutex_lock(&debugfs_mutex);
        for_each_input_queue(irq_ptr, q, i)
-               remove_debugfs_entry(q);
+               debugfs_remove(q->debugfs_q);
        for_each_output_queue(irq_ptr, q, i)
-               remove_debugfs_entry(q);
-       mutex_unlock(&debugfs_mutex);
+               debugfs_remove(q->debugfs_q);
+       debugfs_remove(irq_ptr->debugfs_dev);
 }
 
 int __init qdio_debug_init(void)
 {
-       debugfs_root = debugfs_create_dir("qdio_queues", NULL);
+       debugfs_root = debugfs_create_dir("qdio", NULL);
 
        qdio_dbf_setup = debug_register("qdio_setup", 16, 1, 16);
        debug_register_view(qdio_dbf_setup, &debug_hex_ascii_view);