Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[mirror_ubuntu-artful-kernel.git] / drivers / usb / host / ehci-mem.c

diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 4de43011df23aa970472eda236edb1e334dad0a3..9b7e639772153b43e8f14a7d18df8094f9339662 100644 (file)
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -138,7 +138,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci)
        ehci->sitd_pool = NULL;
 
        if (ehci->periodic)
-               dma_free_coherent (ehci_to_hcd(ehci)->self.controller,
+               dma_free_coherent(ehci_to_hcd(ehci)->self.sysdev,
                        ehci->periodic_size * sizeof (u32),
                        ehci->periodic, ehci->periodic_dma);
        ehci->periodic = NULL;
@@ -155,7 +155,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
 
        /* QTDs for control/bulk/intr transfers */
        ehci->qtd_pool = dma_pool_create ("ehci_qtd",
-                       ehci_to_hcd(ehci)->self.controller,
+                       ehci_to_hcd(ehci)->self.sysdev,
                        sizeof (struct ehci_qtd),
                        32 /* byte alignment (for hw parts) */,
                        4096 /* can't cross 4K */);
@@ -165,7 +165,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
 
        /* QHs for control/bulk/intr transfers */
        ehci->qh_pool = dma_pool_create ("ehci_qh",
-                       ehci_to_hcd(ehci)->self.controller,
+                       ehci_to_hcd(ehci)->self.sysdev,
                        sizeof(struct ehci_qh_hw),
                        32 /* byte alignment (for hw parts) */,
                        4096 /* can't cross 4K */);
@@ -179,7 +179,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
 
        /* ITD for high speed ISO transfers */
        ehci->itd_pool = dma_pool_create ("ehci_itd",
-                       ehci_to_hcd(ehci)->self.controller,
+                       ehci_to_hcd(ehci)->self.sysdev,
                        sizeof (struct ehci_itd),
                        32 /* byte alignment (for hw parts) */,
                        4096 /* can't cross 4K */);
@@ -189,7 +189,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
 
        /* SITD for full/low speed split ISO transfers */
        ehci->sitd_pool = dma_pool_create ("ehci_sitd",
-                       ehci_to_hcd(ehci)->self.controller,
+                       ehci_to_hcd(ehci)->self.sysdev,
                        sizeof (struct ehci_sitd),
                        32 /* byte alignment (for hw parts) */,
                        4096 /* can't cross 4K */);
@@ -199,7 +199,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
 
        /* Hardware periodic table */
        ehci->periodic = (__le32 *)
-               dma_alloc_coherent (ehci_to_hcd(ehci)->self.controller,
+               dma_alloc_coherent(ehci_to_hcd(ehci)->self.sysdev,
                        ehci->periodic_size * sizeof(__le32),
                        &ehci->periodic_dma, flags);
        if (ehci->periodic == NULL) {