From 958bc6b0496b9a33cd740ada724df0f27f7265d8 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 27 May 2019 11:14:59 -0700 Subject: usb: fsl_udc: Use dma_alloc_coherent() to get DMA address Instead on relying virt_to_phys() to do virtual-to-physical address conversion, make use of the fact that dma_alloc_coherent() can already do that for us. Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- drivers/usb/gadget/fsl_udc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/usb') diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c index 705f6c0ba7..a47ba20f46 100644 --- a/drivers/usb/gadget/fsl_udc.c +++ b/drivers/usb/gadget/fsl_udc.c @@ -1143,11 +1143,10 @@ static struct ep_td_struct *fsl_build_dtd(struct fsl_req *req, unsigned *length, (unsigned)EP_MAX_LENGTH_TRANSFER); dtd = dma_alloc_coherent(sizeof(struct ep_td_struct), - DMA_ADDRESS_BROKEN); + dma); if (dtd == NULL) return dtd; - *dma = (dma_addr_t)virt_to_phys(dtd); dtd->td_dma = *dma; /* Clear reserved field */ swap_temp = cpu_to_le32(dtd->size_ioc_sts); @@ -2066,13 +2065,12 @@ static int struct_udc_setup(struct fsl_udc *udc, size &= ~(QH_ALIGNMENT - 1); } - udc->ep_qh = dma_alloc_coherent(size, DMA_ADDRESS_BROKEN); + udc->ep_qh = dma_alloc_coherent(size, &udc->ep_qh_dma); if (!udc->ep_qh) { ERR("malloc QHs for udc failed\n"); kfree(udc->eps); return -1; } - udc->ep_qh_dma = (dma_addr_t)virt_to_phys(udc->ep_qh); udc->ep_qh_size = size; -- cgit v1.2.3