Skip to content

Commit 1b2ac5a

Browse files
committed
s390/3270: use new address translation helpers
Use virt_to_dma32() and friends to properly convert virtual to physical and physical to virtual addresses so that "make C=1" does not generate any warnings anymore. Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent e6ccda5 commit 1b2ac5a

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/s390/char/raw3270.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ struct raw3270_request *raw3270_request_alloc(size_t size)
160160
/*
161161
* Setup ccw.
162162
*/
163-
rq->ccw.cda = __pa(rq->buffer);
163+
rq->ccw.cda = virt_to_dma32(rq->buffer);
164164
rq->ccw.flags = CCW_FLAG_SLI;
165165

166166
return rq;
@@ -186,7 +186,7 @@ int raw3270_request_reset(struct raw3270_request *rq)
186186
return -EBUSY;
187187
rq->ccw.cmd_code = 0;
188188
rq->ccw.count = 0;
189-
rq->ccw.cda = __pa(rq->buffer);
189+
rq->ccw.cda = virt_to_dma32(rq->buffer);
190190
rq->ccw.flags = CCW_FLAG_SLI;
191191
rq->rescnt = 0;
192192
rq->rc = 0;
@@ -221,7 +221,7 @@ EXPORT_SYMBOL(raw3270_request_add_data);
221221
*/
222222
void raw3270_request_set_data(struct raw3270_request *rq, void *data, size_t size)
223223
{
224-
rq->ccw.cda = __pa(data);
224+
rq->ccw.cda = virt_to_dma32(data);
225225
rq->ccw.count = size;
226226
}
227227
EXPORT_SYMBOL(raw3270_request_set_data);
@@ -231,7 +231,7 @@ EXPORT_SYMBOL(raw3270_request_set_data);
231231
*/
232232
void raw3270_request_set_idal(struct raw3270_request *rq, struct idal_buffer *ib)
233233
{
234-
rq->ccw.cda = __pa(ib->data);
234+
rq->ccw.cda = virt_to_dma32(ib->data);
235235
rq->ccw.count = ib->size;
236236
rq->ccw.flags |= CCW_FLAG_IDA;
237237
}
@@ -577,7 +577,7 @@ static void raw3270_read_modified(struct raw3270 *rp)
577577
rp->init_readmod.ccw.cmd_code = TC_READMOD;
578578
rp->init_readmod.ccw.flags = CCW_FLAG_SLI;
579579
rp->init_readmod.ccw.count = sizeof(rp->init_data);
580-
rp->init_readmod.ccw.cda = (__u32)__pa(rp->init_data);
580+
rp->init_readmod.ccw.cda = virt_to_dma32(rp->init_data);
581581
rp->init_readmod.callback = raw3270_read_modified_cb;
582582
rp->init_readmod.callback_data = rp->init_data;
583583
rp->state = RAW3270_STATE_READMOD;
@@ -597,7 +597,7 @@ static void raw3270_writesf_readpart(struct raw3270 *rp)
597597
rp->init_readpart.ccw.cmd_code = TC_WRITESF;
598598
rp->init_readpart.ccw.flags = CCW_FLAG_SLI;
599599
rp->init_readpart.ccw.count = sizeof(wbuf);
600-
rp->init_readpart.ccw.cda = (__u32)__pa(&rp->init_data);
600+
rp->init_readpart.ccw.cda = virt_to_dma32(&rp->init_data);
601601
rp->state = RAW3270_STATE_W4ATTN;
602602
raw3270_start_irq(&rp->init_view, &rp->init_readpart);
603603
}
@@ -635,7 +635,7 @@ static int __raw3270_reset_device(struct raw3270 *rp)
635635
rp->init_reset.ccw.cmd_code = TC_EWRITEA;
636636
rp->init_reset.ccw.flags = CCW_FLAG_SLI;
637637
rp->init_reset.ccw.count = 1;
638-
rp->init_reset.ccw.cda = (__u32)__pa(rp->init_data);
638+
rp->init_reset.ccw.cda = virt_to_dma32(rp->init_data);
639639
rp->init_reset.callback = raw3270_reset_device_cb;
640640
rc = __raw3270_start(rp, &rp->init_view, &rp->init_reset);
641641
if (rc == 0 && rp->state == RAW3270_STATE_INIT)

0 commit comments

Comments
 (0)