diff options
| author | Julian Wiedmann <jwi@linux.ibm.com> | 2020-03-20 14:00:00 +0100 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2020-04-06 13:13:50 +0200 |
| commit | 1da1092dbf61a0c0aab02048232f5e9fcab15861 (patch) | |
| tree | 6e805571a6ff9a011dc262fa98ca5f04f97b2a6a /drivers/s390 | |
| parent | s390/qdio: allow for non-contiguous SBAL array in init_data (diff) | |
| download | linux-1da1092dbf61a0c0aab02048232f5e9fcab15861.tar.xz linux-1da1092dbf61a0c0aab02048232f5e9fcab15861.zip | |
s390/qdio: remove cdev from init_data
It's no longer needed.
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>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/qdio_main.c | 5 | ||||
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 3 | ||||
| -rw-r--r-- | drivers/s390/scsi/zfcp_qdio.c | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index bf617b455428..9d6e51bcd072 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c @@ -1322,11 +1322,12 @@ static void qdio_trace_init_data(struct qdio_irq *irq, /** * qdio_establish - establish queues on a qdio subchannel + * @cdev: associated ccw device * @init_data: initialization data */ -int qdio_establish(struct qdio_initialize *init_data) +int qdio_establish(struct ccw_device *cdev, + struct qdio_initialize *init_data) { - struct ccw_device *cdev = init_data->cdev; struct qdio_irq *irq_ptr = cdev->private->qdio_data; struct subchannel_id schid; int rc; diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 4f90f11942b1..f7689461c242 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -4840,7 +4840,6 @@ static int qeth_qdio_establish(struct qeth_card *card) out_sbal_ptrs[i] = card->qdio.out_qs[i]->qdio_bufs; memset(&init_data, 0, sizeof(struct qdio_initialize)); - init_data.cdev = CARD_DDEV(card); init_data.q_format = IS_IQD(card) ? QDIO_IQDIO_QFMT : QDIO_QETH_QFMT; init_data.qib_param_field_format = 0; @@ -4864,7 +4863,7 @@ static int qeth_qdio_establish(struct qeth_card *card) atomic_set(&card->qdio.state, QETH_QDIO_ALLOCATED); goto out; } - rc = qdio_establish(&init_data); + rc = qdio_establish(CARD_DDEV(card), &init_data); if (rc) { atomic_set(&card->qdio.state, QETH_QDIO_ALLOCATED); qdio_free(CARD_DDEV(card)); diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index 531e2a985d66..26702b56a7ab 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c @@ -364,7 +364,6 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio) atomic_andnot(ZFCP_STATUS_ADAPTER_SIOSL_ISSUED, &qdio->adapter->status); - init_data.cdev = cdev; init_data.q_format = QDIO_ZFCP_QFMT; memcpy(init_data.adapter_name, dev_name(&cdev->dev), 8); ASCEBC(init_data.adapter_name, 8); @@ -381,10 +380,10 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio) init_data.scan_threshold = QDIO_MAX_BUFFERS_PER_Q - ZFCP_QDIO_MAX_SBALS_PER_REQ * 2; - if (qdio_establish(&init_data)) + if (qdio_establish(cdev, &init_data)) goto failed_establish; - if (qdio_get_ssqd_desc(init_data.cdev, &ssqd)) + if (qdio_get_ssqd_desc(cdev, &ssqd)) goto failed_qdio; if (ssqd.qdioac2 & CHSC_AC2_DATA_DIV_ENABLED) |