|
 |
9ae3a8 |
From 20c1e309f606aaec8274ff3cc7471382de049473 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 11 Jul 2014 14:20:48 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 14/43] usb-hcd-xhci: Remove unused sstreamsm member from
|
|
|
9ae3a8 |
XHCIStreamContext
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1405088470-24115-16-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 59828
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 15/37] usb-hcd-xhci: Remove unused sstreamsm member from XHCIStreamContext
|
|
|
9ae3a8 |
Bugzilla: 980747
|
|
|
9ae3a8 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 946ff2c0c353e4bf493f6ff2bcc308adddee4a4c)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/usb/hcd-xhci.c | 9 ---------
|
|
|
9ae3a8 |
1 file changed, 9 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/usb/hcd-xhci.c | 9 ---------
|
|
|
9ae3a8 |
1 file changed, 9 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
index bb3bba3..af0c42d 100644
|
|
|
9ae3a8 |
--- a/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
+++ b/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
@@ -374,7 +374,6 @@ struct XHCIStreamContext {
|
|
|
9ae3a8 |
dma_addr_t pctx;
|
|
|
9ae3a8 |
unsigned int sct;
|
|
|
9ae3a8 |
XHCIRing ring;
|
|
|
9ae3a8 |
- XHCIStreamContext *sstreams;
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
struct XHCIEPContext {
|
|
|
9ae3a8 |
@@ -1135,7 +1134,6 @@ static void xhci_reset_streams(XHCIEPContext *epctx)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
for (i = 0; i < epctx->nr_pstreams; i++) {
|
|
|
9ae3a8 |
epctx->pstreams[i].sct = -1;
|
|
|
9ae3a8 |
- g_free(epctx->pstreams[i].sstreams);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -1148,15 +1146,8 @@ static void xhci_alloc_streams(XHCIEPContext *epctx, dma_addr_t base)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void xhci_free_streams(XHCIEPContext *epctx)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- int i;
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
assert(epctx->pstreams != NULL);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- if (!epctx->lsa) {
|
|
|
9ae3a8 |
- for (i = 0; i < epctx->nr_pstreams; i++) {
|
|
|
9ae3a8 |
- g_free(epctx->pstreams[i].sstreams);
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
g_free(epctx->pstreams);
|
|
|
9ae3a8 |
epctx->pstreams = NULL;
|
|
|
9ae3a8 |
epctx->nr_pstreams = 0;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|