From 9b5984cb17f63e1cf35c7ae694f6e58d56db9450 Mon Sep 17 00:00:00 2001 From: Hoegeun Kwon Date: Wed, 4 Sep 2019 09:09:13 +0900 Subject: [PATCH] usb: dwc_otg: Fix invalid pointer casting Fix build warning about pointer cast. Change-Id: I29b84d07152f9c1745685e156a53275b1e15b6eb Signed-off-by: Hoegeun Kwon --- drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c | 8 ++++---- drivers/usb/host/dwc_otg/dwc_otg_hcd.c | 16 ++++++++-------- drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c | 2 +- drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c index 490a780..4aefe0c 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c @@ -240,7 +240,7 @@ static int notrace fiq_increment_dma_buf(struct fiq_state *st, int num_channels, hcdma_data_t hcdma; int i = st->channel[n].dma_info.index; int len; - struct fiq_dma_blob *blob = (struct fiq_dma_blob *) st->dma_base; + struct fiq_dma_blob *blob = (struct fiq_dma_blob *)(uintptr_t)st->dma_base; len = fiq_get_xfer_len(st, n); fiq_print(FIQDBG_INT, st, "LEN: %03d", len); @@ -249,7 +249,7 @@ static int notrace fiq_increment_dma_buf(struct fiq_state *st, int num_channels, if (i > 6) BUG(); - hcdma.d32 = (dma_addr_t) &blob->channel[n].index[i].buf[0]; + hcdma.d32 = (dma_addr_t)(uintptr_t)&blob->channel[n].index[i].buf[0]; FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA, hcdma.d32); st->channel[n].dma_info.index = i; return 0; @@ -289,7 +289,7 @@ static int notrace fiq_iso_out_advance(struct fiq_state *st, int num_channels, i hcsplt_data_t hcsplt; hctsiz_data_t hctsiz; hcdma_data_t hcdma; - struct fiq_dma_blob *blob = (struct fiq_dma_blob *) st->dma_base; + struct fiq_dma_blob *blob = (struct fiq_dma_blob *)(uintptr_t)st->dma_base; int last = 0; int i = st->channel[n].dma_info.index; @@ -301,7 +301,7 @@ static int notrace fiq_iso_out_advance(struct fiq_state *st, int num_channels, i last = 1; /* New DMA address - address of bounce buffer referred to in index */ - hcdma.d32 = (dma_addr_t) blob->channel[n].index[i].buf; + hcdma.d32 = (dma_addr_t)(uintptr_t)blob->channel[n].index[i].buf; //hcdma.d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA); //hcdma.d32 += st->channel[n].dma_info.slot_len[i]; fiq_print(FIQDBG_INT, st, "LAST: %01d ", last); diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c index 0f6645e..d7cfea6 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c @@ -1270,7 +1270,7 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) hc->multi_count = 1; if (hcd->core_if->dma_enable) { - hc->xfer_buff = (uint8_t *) urb->dma + urb->actual_length; + hc->xfer_buff = (uint8_t *)((uintptr_t)urb->dma + urb->actual_length); /* For non-dword aligned case */ if (((unsigned long)hc->xfer_buff & 0x3) @@ -1314,7 +1314,7 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) hc->ep_is_in = 0; hc->data_pid_start = DWC_OTG_HC_PID_SETUP; if (hcd->core_if->dma_enable) { - hc->xfer_buff = (uint8_t *) urb->setup_dma; + hc->xfer_buff = (uint8_t *)(uintptr_t)urb->setup_dma; } else { hc->xfer_buff = (uint8_t *) urb->setup_packet; } @@ -1362,7 +1362,7 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) hc->xfer_len = 0; if (hcd->core_if->dma_enable) { - hc->xfer_buff = (uint8_t *) hcd->status_buf_dma; + hc->xfer_buff = (uint8_t *)(uintptr_t)hcd->status_buf_dma; } else { hc->xfer_buff = (uint8_t *) hcd->status_buf; } @@ -1390,7 +1390,7 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) frame_desc->status = 0; if (hcd->core_if->dma_enable) { - hc->xfer_buff = (uint8_t *) urb->dma; + hc->xfer_buff = (uint8_t *)(uintptr_t)urb->dma; } else { hc->xfer_buff = (uint8_t *) urb->buf; } @@ -1571,8 +1571,8 @@ int fiq_fsm_setup_periodic_dma(dwc_otg_hcd_t *hcd, struct fiq_channel_state *st, * Pointer arithmetic on hcd->fiq_state->dma_base (a dma_addr_t) * to point it to the correct offset in the allocated buffers. */ - blob = (struct fiq_dma_blob *) hcd->fiq_state->dma_base; - st->hcdma_copy.d32 = (dma_addr_t) blob->channel[hc->hc_num].index[0].buf; + blob = (struct fiq_dma_blob *)(uintptr_t)hcd->fiq_state->dma_base; + st->hcdma_copy.d32 = (dma_addr_t)(uintptr_t)blob->channel[hc->hc_num].index[0].buf; /* Calculate the max number of CSPLITS such that the FIQ can time out * a transaction if it fails. @@ -1627,8 +1627,8 @@ int fiq_fsm_setup_periodic_dma(dwc_otg_hcd_t *hcd, struct fiq_channel_state *st, * dma_addr_t) to point it to the correct offset in the * allocated buffers. */ - blob = (struct fiq_dma_blob *) hcd->fiq_state->dma_base; - st->hcdma_copy.d32 = (dma_addr_t) blob->channel[hc->hc_num].index[0].buf; + blob = (struct fiq_dma_blob *)(uintptr_t)hcd->fiq_state->dma_base; + st->hcdma_copy.d32 = (dma_addr_t)(uintptr_t)blob->channel[hc->hc_num].index[0].buf; /* fixup xfersize to the actual packet size */ st->hctsiz_copy.b.pid = 0; diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c index bd8a204..07c2566 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c @@ -620,7 +620,7 @@ static void init_non_isoc_dma_desc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh) if (n_desc) { /* SG request - more than 1 QTDs */ - hc->xfer_buff = (uint8_t *)qtd->urb->dma + qtd->urb->actual_length; + hc->xfer_buff = (uint8_t *)((uintptr_t)qtd->urb->dma + qtd->urb->actual_length); hc->xfer_len = qtd->urb->length - qtd->urb->actual_length; } diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c index d3097ef..6e6a180 100644 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c @@ -1858,9 +1858,9 @@ static int32_t handle_hc_ahberr_intr(dwc_otg_hcd_t * hcd, dwc_otg_hcd_get_mps(&urb->pipe_info)); DWC_ERROR(" Data buffer length: %d\n", urb->length); DWC_ERROR(" Transfer buffer: %p, Transfer DMA: %p\n", - urb->buf, (void *)urb->dma); + urb->buf, (void *)(uintptr_t)urb->dma); DWC_ERROR(" Setup buffer: %p, Setup DMA: %p\n", - urb->setup_packet, (void *)urb->setup_dma); + urb->setup_packet, (void *)(uintptr_t)urb->setup_dma); DWC_ERROR(" Interval: %d\n", urb->interval); /* Core haltes the channel for Descriptor DMA mode */ -- 2.7.4