Commit dd62abd2 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Vasily Gorbik

s390/qdio: clean up cdev access in qdio_setup_irq()

Some parts use init_data->cdev, others use irq_ptr->cdev. In the end
it's all the same, but unnecessarily confusing.

Use a single reference instead.
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarSteffen Maier <maier@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent c4f762ff
...@@ -453,7 +453,8 @@ static void setup_qib(struct qdio_irq *irq_ptr, ...@@ -453,7 +453,8 @@ static void setup_qib(struct qdio_irq *irq_ptr,
int qdio_setup_irq(struct qdio_initialize *init_data) int qdio_setup_irq(struct qdio_initialize *init_data)
{ {
struct ciw *ciw; struct ciw *ciw;
struct qdio_irq *irq_ptr = init_data->cdev->private->qdio_data; struct ccw_device *cdev = init_data->cdev;
struct qdio_irq *irq_ptr = cdev->private->qdio_data;
memset(&irq_ptr->qib, 0, sizeof(irq_ptr->qib)); memset(&irq_ptr->qib, 0, sizeof(irq_ptr->qib));
memset(&irq_ptr->siga_flag, 0, sizeof(irq_ptr->siga_flag)); memset(&irq_ptr->siga_flag, 0, sizeof(irq_ptr->siga_flag));
...@@ -470,9 +471,9 @@ int qdio_setup_irq(struct qdio_initialize *init_data) ...@@ -470,9 +471,9 @@ int qdio_setup_irq(struct qdio_initialize *init_data)
irq_ptr->int_parm = init_data->int_parm; irq_ptr->int_parm = init_data->int_parm;
irq_ptr->nr_input_qs = init_data->no_input_qs; irq_ptr->nr_input_qs = init_data->no_input_qs;
irq_ptr->nr_output_qs = init_data->no_output_qs; irq_ptr->nr_output_qs = init_data->no_output_qs;
irq_ptr->cdev = init_data->cdev; irq_ptr->cdev = cdev;
irq_ptr->scan_threshold = init_data->scan_threshold; irq_ptr->scan_threshold = init_data->scan_threshold;
ccw_device_get_schid(irq_ptr->cdev, &irq_ptr->schid); ccw_device_get_schid(cdev, &irq_ptr->schid);
setup_queues(irq_ptr, init_data); setup_queues(irq_ptr, init_data);
setup_qib(irq_ptr, init_data); setup_qib(irq_ptr, init_data);
...@@ -488,14 +489,14 @@ int qdio_setup_irq(struct qdio_initialize *init_data) ...@@ -488,14 +489,14 @@ int qdio_setup_irq(struct qdio_initialize *init_data)
/* qdr, qib, sls, slsbs, slibs, sbales are filled now */ /* qdr, qib, sls, slsbs, slibs, sbales are filled now */
/* get qdio commands */ /* get qdio commands */
ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_EQUEUE); ciw = ccw_device_get_ciw(cdev, CIW_TYPE_EQUEUE);
if (!ciw) { if (!ciw) {
DBF_ERROR("%4x NO EQ", irq_ptr->schid.sch_no); DBF_ERROR("%4x NO EQ", irq_ptr->schid.sch_no);
return -EINVAL; return -EINVAL;
} }
irq_ptr->equeue = *ciw; irq_ptr->equeue = *ciw;
ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_AQUEUE); ciw = ccw_device_get_ciw(cdev, CIW_TYPE_AQUEUE);
if (!ciw) { if (!ciw) {
DBF_ERROR("%4x NO AQ", irq_ptr->schid.sch_no); DBF_ERROR("%4x NO AQ", irq_ptr->schid.sch_no);
return -EINVAL; return -EINVAL;
...@@ -503,10 +504,10 @@ int qdio_setup_irq(struct qdio_initialize *init_data) ...@@ -503,10 +504,10 @@ int qdio_setup_irq(struct qdio_initialize *init_data)
irq_ptr->aqueue = *ciw; irq_ptr->aqueue = *ciw;
/* set new interrupt handler */ /* set new interrupt handler */
spin_lock_irq(get_ccwdev_lock(irq_ptr->cdev)); spin_lock_irq(get_ccwdev_lock(cdev));
irq_ptr->orig_handler = init_data->cdev->handler; irq_ptr->orig_handler = cdev->handler;
init_data->cdev->handler = qdio_int_handler; cdev->handler = qdio_int_handler;
spin_unlock_irq(get_ccwdev_lock(irq_ptr->cdev)); spin_unlock_irq(get_ccwdev_lock(cdev));
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment