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

Commit 314eaf7d authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci: delete sp_dma_buffers for scratchpad 



We already have sp_array to store each scratch buffer address for xHC,
it doesn't need another sp_dma_buffers array to store it.

Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 724e882d

drivers/usb/host/xhci-mem.c

+4 −14
Original line number Diff line number Diff line
@@ -1721,36 +1721,27 @@ static int scratchpad_alloc(struct xhci_hcd *xhci, gfp_t flags) 
	if (!xhci->scratchpad->sp_buffers)

		goto fail_sp3;



	xhci->scratchpad->sp_dma_buffers =

		kzalloc(sizeof(dma_addr_t) * num_sp, flags);



	if (!xhci->scratchpad->sp_dma_buffers)

		goto fail_sp4;



	xhci->dcbaa->dev_context_ptrs[0] = cpu_to_le64(xhci->scratchpad->sp_dma);

	for (i = 0; i < num_sp; i++) {

		dma_addr_t dma;

		void *buf = dma_alloc_coherent(dev, xhci->page_size, &dma,

				flags);

		if (!buf)

			goto fail_sp5;

			goto fail_sp4;



		xhci->scratchpad->sp_array[i] = dma;

		xhci->scratchpad->sp_buffers[i] = buf;

		xhci->scratchpad->sp_dma_buffers[i] = dma;

	}



	return 0;



 fail_sp5:

 fail_sp4:

	for (i = i - 1; i >= 0; i--) {

		dma_free_coherent(dev, xhci->page_size,

				    xhci->scratchpad->sp_buffers[i],

				    xhci->scratchpad->sp_dma_buffers[i]);

				    xhci->scratchpad->sp_array[i]);

	}

	kfree(xhci->scratchpad->sp_dma_buffers);



 fail_sp4:

	kfree(xhci->scratchpad->sp_buffers);



 fail_sp3:
@@ -1780,9 +1771,8 @@ static void scratchpad_free(struct xhci_hcd *xhci) 
	for (i = 0; i < num_sp; i++) {

		dma_free_coherent(dev, xhci->page_size,

				    xhci->scratchpad->sp_buffers[i],

				    xhci->scratchpad->sp_dma_buffers[i]);

				    xhci->scratchpad->sp_array[i]);

	}

	kfree(xhci->scratchpad->sp_dma_buffers);

	kfree(xhci->scratchpad->sp_buffers);

	dma_free_coherent(dev, num_sp * sizeof(u64),

			    xhci->scratchpad->sp_array,

drivers/usb/host/xhci.h

+0 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,6 @@ struct xhci_scratchpad { 
	u64 *sp_array;

	dma_addr_t sp_dma;

	void **sp_buffers;

	dma_addr_t *sp_dma_buffers;

};



struct urb_priv {