s390/qdio: set qdio_irq->cdev at allocation time

Set up qdio_irq->cdev right when the qdio_irq struct is allocated, so
that all subsequent code can rely on this pointer.

Then convert two helper functions to not pass a cdev parameter around.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 8564e8a8e3598f4d44ac7f0e7fa12b3f3a3d3876..098bf8c9bbec4c9e18c2e69dcafa5016e6da01f7 100644 (file)
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -391,8 +391,7 @@ int qdio_setup_get_ssqd(struct qdio_irq *irq_ptr,
                        struct subchannel_id *schid,
                        struct qdio_ssqd_desc *data);
 int qdio_setup_irq(struct qdio_irq *irq_ptr, struct qdio_initialize *init_data);
-void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
-                               struct ccw_device *cdev);
+void qdio_print_subchannel_info(struct qdio_irq *irq_ptr);
 void qdio_release_memory(struct qdio_irq *irq_ptr);
 int qdio_setup_init(void);
 void qdio_setup_exit(void);

diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index 8544faddf80cc34552f714df68a8ac3b0de9ffe3..f21fb406bef0603b73ed57ec64eb462a25ce3009 100644 (file)
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -81,7 +81,7 @@ int qdio_allocate_dbf(struct qdio_initialize *init_data,
 
        /* allocate trace view for the interface */
        snprintf(text, QDIO_DBF_NAME_LEN, "qdio_%s",
-                                       dev_name(&init_data->cdev->dev));
+                dev_name(&irq_ptr->cdev->dev));
        irq_ptr->debug_area = qdio_get_dbf_entry(text);
        if (irq_ptr->debug_area)
                DBF_DEV_EVENT(DBF_ERR, irq_ptr, "dbf reused");
@@ -311,16 +311,16 @@ static void setup_debugfs_entry(struct dentry *parent, struct qdio_q *q)
        debugfs_create_file(name, 0444, parent, q, &qstat_fops);
 }
 
-void qdio_setup_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev)
+void qdio_setup_debug_entries(struct qdio_irq *irq_ptr)
 {
        struct qdio_q *q;
        int i;
 
-       irq_ptr->debugfs_dev = debugfs_create_dir(dev_name(&cdev->dev),
+       irq_ptr->debugfs_dev = debugfs_create_dir(dev_name(&irq_ptr->cdev->dev),
                                                  debugfs_root);
        debugfs_create_file("statistics", S_IFREG | S_IRUGO | S_IWUSR,
                            irq_ptr->debugfs_dev, irq_ptr, &debugfs_perf_fops);
-       debugfs_create_file("ssqd", 0444, irq_ptr->debugfs_dev, cdev,
+       debugfs_create_file("ssqd", 0444, irq_ptr->debugfs_dev, irq_ptr->cdev,
                            &ssqd_fops);
 
        for_each_input_queue(irq_ptr, q, i)

diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h
index f85f5fa7cefc76889b0fb0c98ac5712707289f39..122450ba6b90b63a20a2a51fd349d0b883a00807 100644 (file)
--- a/drivers/s390/cio/qdio_debug.h
+++ b/drivers/s390/cio/qdio_debug.h
@@ -66,8 +66,7 @@ static inline void DBF_DEV_HEX(struct qdio_irq *dev, void *addr,
 
 int qdio_allocate_dbf(struct qdio_initialize *init_data,
                       struct qdio_irq *irq_ptr);
-void qdio_setup_debug_entries(struct qdio_irq *irq_ptr,
-                             struct ccw_device *cdev);
+void qdio_setup_debug_entries(struct qdio_irq *irq_ptr);
 void qdio_shutdown_debug_entries(struct qdio_irq *irq_ptr);
 int qdio_debug_init(void);
 void qdio_debug_exit(void);

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 2886b95f47416c31bb5f1b2ac5a0699925b13636..e93155dbe887fb58909ecc103a116c01ca2d090c 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -1229,10 +1229,11 @@ EXPORT_SYMBOL_GPL(qdio_free);
  */
 int qdio_allocate(struct qdio_initialize *init_data)
 {
+       struct ccw_device *cdev = init_data->cdev;
        struct subchannel_id schid;
        struct qdio_irq *irq_ptr;
 
-       ccw_device_get_schid(init_data->cdev, &schid);
+       ccw_device_get_schid(cdev, &schid);
        DBF_EVENT("qallocate:%4x", schid.sch_no);
 
        if ((init_data->no_input_qs && !init_data->input_handler) ||
@@ -1252,6 +1253,7 @@ int qdio_allocate(struct qdio_initialize *init_data)
        if (!irq_ptr)
                goto out_err;
 
+       irq_ptr->cdev = cdev;
        mutex_init(&irq_ptr->setup_mutex);
        if (qdio_allocate_dbf(init_data, irq_ptr))
                goto out_rel;
@@ -1276,7 +1278,7 @@ int qdio_allocate(struct qdio_initialize *init_data)
                goto out_rel;
 
        INIT_LIST_HEAD(&irq_ptr->entry);
-       init_data->cdev->private->qdio_data = irq_ptr;
+       cdev->private->qdio_data = irq_ptr;
        qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE);
        return 0;
 out_rel:
@@ -1372,8 +1374,8 @@ int qdio_establish(struct qdio_initialize *init_data)
        qdio_init_buf_states(irq_ptr);
 
        mutex_unlock(&irq_ptr->setup_mutex);
-       qdio_print_subchannel_info(irq_ptr, cdev);
-       qdio_setup_debug_entries(irq_ptr, cdev);
+       qdio_print_subchannel_info(irq_ptr);
+       qdio_setup_debug_entries(irq_ptr);
        return 0;
 }
 EXPORT_SYMBOL_GPL(qdio_establish);

diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index ad04947a003238fe1aefe5f938323688d669c2ad..e1b7a9118f9dde2f45136e799d9a7510ffe6675d 100644 (file)
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -452,8 +452,8 @@ static void setup_qib(struct qdio_irq *irq_ptr,
 
 int qdio_setup_irq(struct qdio_irq *irq_ptr, struct qdio_initialize *init_data)
 {
+       struct ccw_device *cdev = irq_ptr->cdev;
        struct ciw *ciw;
-       struct ccw_device *cdev = init_data->cdev;
 
        memset(&irq_ptr->qib, 0, sizeof(irq_ptr->qib));
        memset(&irq_ptr->siga_flag, 0, sizeof(irq_ptr->siga_flag));
@@ -471,7 +471,6 @@ int qdio_setup_irq(struct qdio_irq *irq_ptr, struct qdio_initialize *init_data)
        irq_ptr->int_parm = init_data->int_parm;
        irq_ptr->nr_input_qs = init_data->no_input_qs;
        irq_ptr->nr_output_qs = init_data->no_output_qs;
-       irq_ptr->cdev = cdev;
        irq_ptr->scan_threshold = init_data->scan_threshold;
        ccw_device_get_schid(cdev, &irq_ptr->schid);
        setup_queues(irq_ptr, init_data);
@@ -511,14 +510,13 @@ int qdio_setup_irq(struct qdio_irq *irq_ptr, struct qdio_initialize *init_data)
        return 0;
 }
 
-void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
-                               struct ccw_device *cdev)
+void qdio_print_subchannel_info(struct qdio_irq *irq_ptr)
 {
        char s[80];
 
        snprintf(s, 80, "qdio: %s %s on SC %x using "
                 "AI:%d QEBSM:%d PRI:%d TDD:%d SIGA:%s%s%s%s%s\n",
-                dev_name(&cdev->dev),
+                dev_name(&irq_ptr->cdev->dev),
                 (irq_ptr->qib.qfmt == QDIO_QETH_QFMT) ? "OSA" :
                        ((irq_ptr->qib.qfmt == QDIO_ZFCP_QFMT) ? "ZFCP" : "HS"),
                 irq_ptr->schid.sch_no,