Commit 22072e83 authored by Souptick Joarder's avatar Souptick Joarder Committed by Greg Kroah-Hartman

usb: host: ehci: Use dma_pool_zalloc()

Use dma_pool_zalloc() instead of dma_pool_alloc + memset
Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7928b2cb
...@@ -73,10 +73,9 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags) ...@@ -73,10 +73,9 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
if (!qh) if (!qh)
goto done; goto done;
qh->hw = (struct ehci_qh_hw *) qh->hw = (struct ehci_qh_hw *)
dma_pool_alloc(ehci->qh_pool, flags, &dma); dma_pool_zalloc(ehci->qh_pool, flags, &dma);
if (!qh->hw) if (!qh->hw)
goto fail; goto fail;
memset(qh->hw, 0, sizeof *qh->hw);
qh->qh_dma = dma; qh->qh_dma = dma;
// INIT_LIST_HEAD (&qh->qh_list); // INIT_LIST_HEAD (&qh->qh_list);
INIT_LIST_HEAD (&qh->qtd_list); INIT_LIST_HEAD (&qh->qtd_list);
......
...@@ -1287,7 +1287,7 @@ itd_urb_transaction( ...@@ -1287,7 +1287,7 @@ itd_urb_transaction(
} else { } else {
alloc_itd: alloc_itd:
spin_unlock_irqrestore(&ehci->lock, flags); spin_unlock_irqrestore(&ehci->lock, flags);
itd = dma_pool_alloc(ehci->itd_pool, mem_flags, itd = dma_pool_zalloc(ehci->itd_pool, mem_flags,
&itd_dma); &itd_dma);
spin_lock_irqsave(&ehci->lock, flags); spin_lock_irqsave(&ehci->lock, flags);
if (!itd) { if (!itd) {
...@@ -1297,7 +1297,6 @@ itd_urb_transaction( ...@@ -1297,7 +1297,6 @@ itd_urb_transaction(
} }
} }
memset(itd, 0, sizeof(*itd));
itd->itd_dma = itd_dma; itd->itd_dma = itd_dma;
itd->frame = NO_FRAME; itd->frame = NO_FRAME;
list_add(&itd->itd_list, &sched->td_list); list_add(&itd->itd_list, &sched->td_list);
...@@ -2081,7 +2080,7 @@ sitd_urb_transaction( ...@@ -2081,7 +2080,7 @@ sitd_urb_transaction(
} else { } else {
alloc_sitd: alloc_sitd:
spin_unlock_irqrestore(&ehci->lock, flags); spin_unlock_irqrestore(&ehci->lock, flags);
sitd = dma_pool_alloc(ehci->sitd_pool, mem_flags, sitd = dma_pool_zalloc(ehci->sitd_pool, mem_flags,
&sitd_dma); &sitd_dma);
spin_lock_irqsave(&ehci->lock, flags); spin_lock_irqsave(&ehci->lock, flags);
if (!sitd) { if (!sitd) {
...@@ -2091,7 +2090,6 @@ sitd_urb_transaction( ...@@ -2091,7 +2090,6 @@ sitd_urb_transaction(
} }
} }
memset(sitd, 0, sizeof(*sitd));
sitd->sitd_dma = sitd_dma; sitd->sitd_dma = sitd_dma;
sitd->frame = NO_FRAME; sitd->frame = NO_FRAME;
list_add(&sitd->sitd_list, &iso_sched->td_list); list_add(&sitd->sitd_list, &iso_sched->td_list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment