diff mbox series

[06/27] xhci: dbc: Remove dbc_dma_free_coherent() wrapper

Message ID	20200723144530.9992-7-mathias.nyman@linux.intel.com (mailing list archive)
State	Superseded
Commit	bcf87ea6e2d08eab75ba2aa53336a630421becfb
Headers	show Return-Path: <SRS0=f5PK=BC=vger.kernel.org=linux-usb-owner@kernel.org> IronPort-SDR: jATlXEDK2EOB5N2pJNSFImjITszCOYt4qEF98UUcVjt2NJDZf52tSp2IoJfy3nw1Z6OsbOu9yn tOpFNDS715/Q== IronPort-SDR: EfJVRokKDSJ+ax4Y9IaOIaeQN7znmcu7F1V6khpXpnXCM1oIkAY3e7+TzTaBRNH3OVPQ6vVuvd ktUJBbCw73og== From: Mathias Nyman <mathias.nyman@linux.intel.com> To: <gregkh@linuxfoundation.org> Cc: <linux-usb@vger.kernel.org>, Mathias Nyman <mathias.nyman@linux.intel.com> Subject: [PATCH 06/27] xhci: dbc: Remove dbc_dma_free_coherent() wrapper Date: Thu, 23 Jul 2020 17:45:09 +0300 Message-Id: <20200723144530.9992-7-mathias.nyman@linux.intel.com> In-Reply-To: <20200723144530.9992-1-mathias.nyman@linux.intel.com> References: <20200723144530.9992-1-mathias.nyman@linux.intel.com> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk
Series	xhci features for usb-next \| expand [00/27] xhci features for usb-next [01/27] xhci: Make debug message consistent with bus and port number [02/27] xhci: dbc: Don't use generic xhci inc_deq() function for dbc [03/27] xhci: Don't pass struct xhci_hcd pointer to xhci_link_seg() [04/27] xhci: dbc: Don't use generic xhci erst allocation and free functions [05/27] xhci: dbc: Remove dbc_dma_alloc_coherent() wrapper [06/27] xhci: dbc: Remove dbc_dma_free_coherent() wrapper [07/27] xhci: dbc: Add device pointer to dbc structure [08/27] xhci: dbc: Use dev_info() and similar instead of xhci_info() [09/27] xhci: dbc: Don't use xhci_write_64() as it takes xhci as a parameter [10/27] xhci: dbc: Don't pass the xhci pointer as a parameter to xhci_dbc_init_context() [11/27] xhci: dbc: Get the device pointer from dbc structure in dbc_ep_do_queue() [12/27] xhci: dbc: Pass dbc pointer to endpoint init and exit functions. [13/27] xhci: dbc: Change to pass dbc pointer to xhci_do_dbc_stop() [14/27] xhci: dbc: Pass dbc pointer to dbc_handle_xfer_event() instead of xhci_hcd pointer [15/27] xhci: dbgtty: Pass dbc pointer when registering a dbctty device [16/27] xhci: dbc: Pass dbc pointer to get_in/out_ep() helper functions to get endpoints [17/27] xhci: dbc: Use dbc structure in the request completion instead of xhci_hcd [18/27] xhci: dbc: Don't use generic xhci context allocation for dbc [19/27] xhci: dbc: don't use generic xhci ring allocation functions for dbc. [20/27] xhci: dbc: Pass dbc pointer to dbc memory init and cleanup functions [21/27] xhci: dbc: Pass dbc pointer to dbc start and stop functions. [22/27] xhci: dbc: simplify dbc requests allocation and queueing [23/27] xhci: dbc: remove endpoint pointers from dbc_port structure [24/27] xhci: dbctty: split dbc tty driver registration and unregistration functions. [25/27] xhci: dbc: Add a operations structure to access driver functions [26/27] xhci: dbgcap: remove dbc dependency on dbctty specific flag [27/27] xhci: dbc: remove tty specific port structure from struct xhci_dbc

Commit Message

Mathias Nyman July 23, 2020, 2:45 p.m. UTC

dbc_dma_free_coherent() takes struct xhci_hcd pointer as a parameter, but
does nothing more than calls dma_free_coherent().
Remove it and call dma_free_coherent() directly instead.

No functional changes
This change helps decoupling xhci and DbC

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
 drivers/usb/host/xhci-dbgcap.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff mbox series

Patch

diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c
index e8a2cbda135c..5bec36ed97c6 100644
--- a/drivers/usb/host/xhci-dbgcap.c
+++ b/drivers/usb/host/xhci-dbgcap.c
@@ -14,15 +14,6 @@ 
 #include "xhci-trace.h"
 #include "xhci-dbgcap.h"
 
-static inline void
-dbc_dma_free_coherent(struct xhci_hcd *xhci, size_t size,
-		      void *cpu_addr, dma_addr_t dma_handle)
-{
-	if (cpu_addr)
-		dma_free_coherent(xhci_to_hcd(xhci)->self.sysdev,
-				  size, cpu_addr, dma_handle);
-}
-
 static u32 xhci_dbc_populate_strings(struct dbc_str_descs *strings)
 {
 	struct usb_string_descriptor	*s_desc;
@@ -465,9 +456,8 @@  static void xhci_dbc_mem_cleanup(struct xhci_hcd *xhci)
 	xhci_dbc_eps_exit(xhci);
 
 	if (dbc->string) {
-		dbc_dma_free_coherent(xhci,
-				      dbc->string_size,
-				      dbc->string, dbc->string_dma);
+		dma_free_coherent(dbc->dev, dbc->string_size,
+				  dbc->string, dbc->string_dma);
 		dbc->string = NULL;
 	}