hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Julian Wiedmann 2020-03-20 14:00:00 +01:00 committed by Vasily Gorbik
parent d8564e19da
commit 1da1092dbf
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/s390/include/asm/qdio.h
View File

@ -325,7 +325,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,
/** /**
* struct qdio_initialize - qdio initialization data * struct qdio_initialize - qdio initialization data
* @cdev: associated ccw device
* @q_format: queue format * @q_format: queue format
* @qdr_ac: feature flags to set * @qdr_ac: feature flags to set
* @adapter_name: name for the adapter * @adapter_name: name for the adapter
@ -346,7 +345,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,
* @output_sbal_state_array: no_output_qs * 128 state info (for CQ or NULL) * @output_sbal_state_array: no_output_qs * 128 state info (for CQ or NULL)
*/ */
struct qdio_initialize { struct qdio_initialize {
struct ccw_device *cdev;
unsigned char q_format; unsigned char q_format;
unsigned char qdr_ac; unsigned char qdr_ac;
unsigned char adapter_name[8]; unsigned char adapter_name[8];
@ -410,7 +408,8 @@ void qdio_reset_buffers(struct qdio_buffer **buf, unsigned int count);
extern int qdio_allocate(struct ccw_device *cdev, unsigned int no_input_qs, extern int qdio_allocate(struct ccw_device *cdev, unsigned int no_input_qs,
unsigned int no_output_qs); unsigned int no_output_qs);
extern int qdio_establish(struct qdio_initialize *); extern int qdio_establish(struct ccw_device *cdev,
struct qdio_initialize *init_data);
extern int qdio_activate(struct ccw_device *); extern int qdio_activate(struct ccw_device *);
extern void qdio_release_aob(struct qaob *); extern void qdio_release_aob(struct qaob *);
extern int do_QDIO(struct ccw_device *, unsigned int, int, unsigned int, extern int do_QDIO(struct ccw_device *, unsigned int, int, unsigned int,

5
drivers/s390/cio/qdio_main.c
View File

@ -1322,11 +1322,12 @@ static void qdio_trace_init_data(struct qdio_irq *irq,
/** /**
* qdio_establish - establish queues on a qdio subchannel * qdio_establish - establish queues on a qdio subchannel
* @cdev: associated ccw device
* @init_data: initialization data * @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 qdio_irq *irq_ptr = cdev->private->qdio_data;
struct subchannel_id schid; struct subchannel_id schid;
int rc; int rc;

3
drivers/s390/net/qeth_core_main.c
View File

@ -4840,7 +4840,6 @@ static int qeth_qdio_establish(struct qeth_card *card)
out_sbal_ptrs[i] = card->qdio.out_qs[i]->qdio_bufs; out_sbal_ptrs[i] = card->qdio.out_qs[i]->qdio_bufs;
memset(&init_data, 0, sizeof(struct qdio_initialize)); memset(&init_data, 0, sizeof(struct qdio_initialize));
init_data.cdev = CARD_DDEV(card);
init_data.q_format = IS_IQD(card) ? QDIO_IQDIO_QFMT : init_data.q_format = IS_IQD(card) ? QDIO_IQDIO_QFMT :
QDIO_QETH_QFMT; QDIO_QETH_QFMT;
init_data.qib_param_field_format = 0; 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); atomic_set(&card->qdio.state, QETH_QDIO_ALLOCATED);
goto out; goto out;
} }
rc = qdio_establish(&init_data); rc = qdio_establish(CARD_DDEV(card), &init_data);
if (rc) { if (rc) {
atomic_set(&card->qdio.state, QETH_QDIO_ALLOCATED); atomic_set(&card->qdio.state, QETH_QDIO_ALLOCATED);
qdio_free(CARD_DDEV(card)); qdio_free(CARD_DDEV(card));

5
drivers/s390/scsi/zfcp_qdio.c
View File

@ -364,7 +364,6 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio)
atomic_andnot(ZFCP_STATUS_ADAPTER_SIOSL_ISSUED, atomic_andnot(ZFCP_STATUS_ADAPTER_SIOSL_ISSUED,
&qdio->adapter->status); &qdio->adapter->status);
init_data.cdev = cdev;
init_data.q_format = QDIO_ZFCP_QFMT; init_data.q_format = QDIO_ZFCP_QFMT;
memcpy(init_data.adapter_name, dev_name(&cdev->dev), 8); memcpy(init_data.adapter_name, dev_name(&cdev->dev), 8);
ASCEBC(init_data.adapter_name, 8); ASCEBC(init_data.adapter_name, 8);
@ -381,10 +380,10 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio)
init_data.scan_threshold = init_data.scan_threshold =
QDIO_MAX_BUFFERS_PER_Q - ZFCP_QDIO_MAX_SBALS_PER_REQ * 2; 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; goto failed_establish;
if (qdio_get_ssqd_desc(init_data.cdev, &ssqd)) if (qdio_get_ssqd_desc(cdev, &ssqd))
goto failed_qdio; goto failed_qdio;
if (ssqd.qdioac2 & CHSC_AC2_DATA_DIV_ENABLED) if (ssqd.qdioac2 & CHSC_AC2_DATA_DIV_ENABLED)