UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "usb: host: fotg210: Use dma_pool_zalloc" 

This reverts commit cb6a0db8fd for the
same reason as commit 43b78f1155 in the
ehci-hcd driver.

Alan writes:
    What you can't see just from reading the patch is that in both
    cases (ehci->itd_pool and ehci->sitd_pool) there are two
    allocation paths -- the two branches of an "if" statement -- and
    only one of the paths calls dma_pool_[z]alloc.  However, the
    memset is needed for both paths, and so it can't be eliminated.
    Given that it must be present, there's no advantage to calling
    dma_pool_zalloc rather than dma_pool_alloc.

Signed-off-by: Kelly Devilliv <kelly.devilliv@gmail.com>
Link: https://lore.kernel.org/r/20210627125747.127646-2-kelly.devilliv@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kelly Devilliv 2021-06-27 20:57:45 +08:00 committed by Greg Kroah-Hartman
parent 97db1b081e
commit c4c1faf825
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/host/fotg210-hcd.c
View File

@ -1858,9 +1858,11 @@ static struct fotg210_qh *fotg210_qh_alloc(struct fotg210_hcd *fotg210,
qh = kzalloc(sizeof(*qh), GFP_ATOMIC); qh = kzalloc(sizeof(*qh), GFP_ATOMIC);
if (!qh) if (!qh)
goto done; goto done;
qh->hw = dma_pool_zalloc(fotg210->qh_pool, flags, &dma); qh->hw = (struct fotg210_qh_hw *)
dma_pool_alloc(fotg210->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->qtd_list); INIT_LIST_HEAD(&qh->qtd_list);
@ -4112,7 +4114,7 @@ static int itd_urb_transaction(struct fotg210_iso_stream *stream,
} else { } else {
alloc_itd: alloc_itd:
spin_unlock_irqrestore(&fotg210->lock, flags); spin_unlock_irqrestore(&fotg210->lock, flags);
itd = dma_pool_zalloc(fotg210->itd_pool, mem_flags, itd = dma_pool_alloc(fotg210->itd_pool, mem_flags,
&itd_dma); &itd_dma);
spin_lock_irqsave(&fotg210->lock, flags); spin_lock_irqsave(&fotg210->lock, flags);
if (!itd) { if (!itd) {
@ -4122,6 +4124,7 @@ alloc_itd:
} }
} }
memset(itd, 0, sizeof(*itd));
itd->itd_dma = itd_dma; itd->itd_dma = itd_dma;
list_add(&itd->itd_list, &sched->td_list); list_add(&itd->itd_list, &sched->td_list);
} }