Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb6a0db8 authored by Vasyl Gomonovych's avatar Vasyl Gomonovych Committed by Greg Kroah-Hartman
Browse files

usb: host: fotg210: Use dma_pool_zalloc 



Replacing dma_pool_alloc and memset with a single call to dma_pool_zalloc

Signed-off-by: default avatarVasyl Gomonovych <gomonovych@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0f3ed87

drivers/usb/host/fotg210-hcd.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -1865,11 +1865,9 @@ 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 = (struct fotg210_qh_hw *)

	qh->hw = dma_pool_zalloc(fotg210->qh_pool, flags, &dma);

		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);
@@ -4121,7 +4119,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_alloc(fotg210->itd_pool, mem_flags,

			itd = dma_pool_zalloc(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) {
@@ -4131,7 +4129,6 @@ static int itd_urb_transaction(struct fotg210_iso_stream *stream, 
			}

			}

		}

		}





		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);

	}

	}