Commit c722e055 authored by Chu Guangqing's avatar Chu Guangqing Committed by Jon Mason
Browse files

ntb: migrate to dma_map_phys instead of map_page 



After introduction of dma_map_phys(), there is no need to convert
from physical address to struct page in order to map page. So let's
use it directly.

Signed-off-by: default avatarChu Guangqing <chuguangqing@inspur.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent 322617a0

drivers/ntb/ntb_transport.c

+6 −6
Original line number Diff line number Diff line
@@ -1589,15 +1589,15 @@ static int ntb_async_rx_submit(struct ntb_queue_entry *entry, void *offset) 
		goto err;



	unmap->len = len;

	unmap->addr[0] = dma_map_page(device->dev, virt_to_page(offset),

				      pay_off, len, DMA_TO_DEVICE);

	unmap->addr[0] = dma_map_phys(device->dev, virt_to_phys(offset),

				      len, DMA_TO_DEVICE, 0);

	if (dma_mapping_error(device->dev, unmap->addr[0]))

		goto err_get_unmap;



	unmap->to_cnt = 1;



	unmap->addr[1] = dma_map_page(device->dev, virt_to_page(buf),

				      buff_off, len, DMA_FROM_DEVICE);

	unmap->addr[1] = dma_map_phys(device->dev, virt_to_phys(buf),

				      len, DMA_FROM_DEVICE, 0);

	if (dma_mapping_error(device->dev, unmap->addr[1]))

		goto err_get_unmap;
@@ -1923,8 +1923,8 @@ static int ntb_async_tx_submit(struct ntb_transport_qp *qp, 
		goto err;



	unmap->len = len;

	unmap->addr[0] = dma_map_page(device->dev, virt_to_page(buf),

				      buff_off, len, DMA_TO_DEVICE);

	unmap->addr[0] = dma_map_phys(device->dev, virt_to_phys(buf),

				      len, DMA_TO_DEVICE, 0);

	if (dma_mapping_error(device->dev, unmap->addr[0]))

		goto err_get_unmap;