add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/s390/cio/device_pgid.c
..
..
@@ -57,7 +57,7 @@
57
57
 static void nop_build_cp(struct ccw_device *cdev)
58
58
 {
59
59
 	struct ccw_request *req = &cdev->private->req;
60
-	struct ccw1 *cp = cdev->private->iccws;
60
+	struct ccw1 *cp = cdev->private->dma_area->iccws;
61
61
 
62
62
 	cp->cmd_code	= CCW_CMD_NOOP;
63
63
 	cp->cda		= 0;
..
..
@@ -134,9 +134,9 @@
134
134
 static void spid_build_cp(struct ccw_device *cdev, u8 fn)
135
135
 {
136
136
 	struct ccw_request *req = &cdev->private->req;
137
-	struct ccw1 *cp = cdev->private->iccws;
137
+	struct ccw1 *cp = cdev->private->dma_area->iccws;
138
138
 	int i = pathmask_to_pos(req->lpm);
139
-	struct pgid *pgid = &cdev->private->pgid[i];
139
+	struct pgid *pgid = &cdev->private->dma_area->pgid[i];
140
140
 
141
141
 	pgid->inf.fc	= fn;
142
142
 	cp->cmd_code	= CCW_CMD_SET_PGID;
..
..
@@ -300,7 +300,7 @@
300
300
 static void pgid_analyze(struct ccw_device *cdev, struct pgid **p,
301
301
 			 int *mismatch, u8 *reserved, u8 *reset)
302
302
 {
303
-	struct pgid *pgid = &cdev->private->pgid[0];
303
+	struct pgid *pgid = &cdev->private->dma_area->pgid[0];
304
304
 	struct pgid *first = NULL;
305
305
 	int lpm;
306
306
 	int i;
..
..
@@ -342,7 +342,7 @@
342
342
 		lpm = 0x80 >> i;
343
343
 		if ((cdev->private->pgid_valid_mask & lpm) == 0)
344
344
 			continue;
345
-		pgid = &cdev->private->pgid[i];
345
+		pgid = &cdev->private->dma_area->pgid[i];
346
346
 		if (sch->opm & lpm) {
347
347
 			if (pgid->inf.ps.state1 != SNID_STATE1_GROUPED)
348
348
 				continue;
..
..
@@ -368,7 +368,8 @@
368
368
 	int i;
369
369
 
370
370
 	for (i = 0; i < 8; i++)
371
-		memcpy(&cdev->private->pgid[i], pgid, sizeof(struct pgid));
371
+		memcpy(&cdev->private->dma_area->pgid[i], pgid,
372
+		       sizeof(struct pgid));
372
373
 }
373
374
 
374
375
 /*
..
..
@@ -435,12 +436,12 @@
435
436
 static void snid_build_cp(struct ccw_device *cdev)
436
437
 {
437
438
 	struct ccw_request *req = &cdev->private->req;
438
-	struct ccw1 *cp = cdev->private->iccws;
439
+	struct ccw1 *cp = cdev->private->dma_area->iccws;
439
440
 	int i = pathmask_to_pos(req->lpm);
440
441
 
441
442
 	/* Channel program setup. */
442
443
 	cp->cmd_code	= CCW_CMD_SENSE_PGID;
443
-	cp->cda		= (u32) (addr_t) &cdev->private->pgid[i];
444
+	cp->cda		= (u32) (addr_t) &cdev->private->dma_area->pgid[i];
444
445
 	cp->count	= sizeof(struct pgid);
445
446
 	cp->flags	= CCW_FLAG_SLI;
446
447
 	req->cp		= cp;
..
..
@@ -516,7 +517,8 @@
516
517
 	sch->lpm = sch->schib.pmcw.pam;
517
518
 
518
519
 	/* Initialize PGID data. */
519
-	memset(cdev->private->pgid, 0, sizeof(cdev->private->pgid));
520
+	memset(cdev->private->dma_area->pgid, 0,
521
+	       sizeof(cdev->private->dma_area->pgid));
520
522
 	cdev->private->pgid_valid_mask = 0;
521
523
 	cdev->private->pgid_todo_mask = sch->schib.pmcw.pam;
522
524
 	cdev->private->path_notoper_mask = 0;
..
..
@@ -626,7 +628,7 @@
626
628
 static void stlck_build_cp(struct ccw_device *cdev, void *buf1, void *buf2)
627
629
 {
628
630
 	struct ccw_request *req = &cdev->private->req;
629
-	struct ccw1 *cp = cdev->private->iccws;
631
+	struct ccw1 *cp = cdev->private->dma_area->iccws;
630
632
 
631
633
 	cp[0].cmd_code = CCW_CMD_STLCK;
632
634
 	cp[0].cda = (u32) (addr_t) buf1;