From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RM8CD-0000Ov-QT for qemu-devel@nongnu.org; Thu, 03 Nov 2011 21:03:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RM8CB-0004K0-9d for qemu-devel@nongnu.org; Thu, 03 Nov 2011 21:03:49 -0400 Received: from ozlabs.org ([203.10.76.45]:42253) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RM8CA-0004Jo-Tu for qemu-devel@nongnu.org; Thu, 03 Nov 2011 21:03:47 -0400 From: David Gibson Date: Fri, 4 Nov 2011 12:03:38 +1100 Message-Id: <1320368618-22733-8-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1320368618-22733-1-git-send-email-david@gibson.dropbear.id.au> References: <1320368618-22733-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 7/7] Remove unnecessary casts from PCI DMA code in usb-uhci List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: joerg.roedel@amd.com, agraf@suse.de, qemu-devel@nongnu.org, avi@redhat.com, eduard.munteanu@linux360.ro, sw@weilnetz.de, rth@twiddle.net This patch removes some unnecessary casts in the usb-uhci device, introduced by commit fff23ee9a5de74ab111b3cea9eec56782e7d7c50 'usb-uhci: Use PCI DMA stub functions'. Signed-off-by: David Gibson --- hw/usb-uhci.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index f9e3ea5..f8912e2 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -876,7 +876,7 @@ static void uhci_async_complete(USBPort *port, USBPacket *packet) uint32_t link = async->td; uint32_t int_mask = 0, val; - pci_dma_read(&s->dev, link & ~0xf, (uint8_t *) &td, sizeof(td)); + pci_dma_read(&s->dev, link & ~0xf, &td, sizeof(td)); le32_to_cpus(&td.link); le32_to_cpus(&td.ctrl); le32_to_cpus(&td.token); @@ -888,8 +888,7 @@ static void uhci_async_complete(USBPort *port, USBPacket *packet) /* update the status bits of the TD */ val = cpu_to_le32(td.ctrl); - pci_dma_write(&s->dev, (link & ~0xf) + 4, - (const uint8_t *)&val, sizeof(val)); + pci_dma_write(&s->dev, (link & ~0xf) + 4, &val, sizeof(val)); uhci_async_free(s, async); } else { async->done = 1; @@ -952,7 +951,7 @@ static void uhci_process_frame(UHCIState *s) DPRINTF("uhci: processing frame %d addr 0x%x\n" , s->frnum, frame_addr); - pci_dma_read(&s->dev, frame_addr, (uint8_t *)&link, 4); + pci_dma_read(&s->dev, frame_addr, &link, 4); le32_to_cpus(&link); int_mask = 0; @@ -976,7 +975,7 @@ static void uhci_process_frame(UHCIState *s) break; } - pci_dma_read(&s->dev, link & ~0xf, (uint8_t *) &qh, sizeof(qh)); + pci_dma_read(&s->dev, link & ~0xf, &qh, sizeof(qh)); le32_to_cpus(&qh.link); le32_to_cpus(&qh.el_link); @@ -996,7 +995,7 @@ static void uhci_process_frame(UHCIState *s) } /* TD */ - pci_dma_read(&s->dev, link & ~0xf, (uint8_t *) &td, sizeof(td)); + pci_dma_read(&s->dev, link & ~0xf, &td, sizeof(td)); le32_to_cpus(&td.link); le32_to_cpus(&td.ctrl); le32_to_cpus(&td.token); @@ -1010,8 +1009,7 @@ static void uhci_process_frame(UHCIState *s) if (old_td_ctrl != td.ctrl) { /* update the status bits of the TD */ val = cpu_to_le32(td.ctrl); - pci_dma_write(&s->dev, (link & ~0xf) + 4, - (const uint8_t *)&val, sizeof(val)); + pci_dma_write(&s->dev, (link & ~0xf) + 4, &val, sizeof(val)); } if (ret < 0) { @@ -1039,8 +1037,7 @@ static void uhci_process_frame(UHCIState *s) /* update QH element link */ qh.el_link = link; val = cpu_to_le32(qh.el_link); - pci_dma_write(&s->dev, (curr_qh & ~0xf) + 4, - (const uint8_t *)&val, sizeof(val)); + pci_dma_write(&s->dev, (curr_qh & ~0xf) + 4, &val, sizeof(val)); if (!depth_first(link)) { /* done with this QH */ -- 1.7.7