leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xhci: dbc: Rename xhci_dbc_init and xhci_dbc_exit

Browse Source 
These names give the impression the functions are related to
module init calls, but are in fact creating and removing the dbc
fake device

Rename them to xhci_create_dbc_dev() and xhci_remove_dbc_dev().

We will need the _init and _exit names for actual dbc module init
and exit calls.

No functional changes

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20220216095153.1303105-4-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathias Nyman
2022-02-16 11:51:47 +02:00
committed by Greg Kroah-Hartman
parent 5ce036b98d
commit 5c44d9d757
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/host/xhci-dbgcap.c
View File

@@ -1017,7 +1017,8 @@ void xhci_dbc_remove(struct xhci_dbc *dbc)
kfree(dbc); kfree(dbc);
} }
int xhci_dbc_init(struct xhci_hcd *xhci)
int xhci_create_dbc_dev(struct xhci_hcd *xhci)
{ {
struct device *dev; struct device *dev;
void __iomem *base; void __iomem *base;
@@ -1041,7 +1042,7 @@ int xhci_dbc_init(struct xhci_hcd *xhci)
return ret; return ret;
} }
void xhci_dbc_exit(struct xhci_hcd *xhci) void xhci_remove_dbc_dev(struct xhci_hcd *xhci)
{ {
unsigned long flags; unsigned long flags;

8
drivers/usb/host/xhci-dbgcap.h
View File

@@ -194,8 +194,8 @@ static inline struct dbc_ep *get_out_ep(struct xhci_dbc *dbc)
} }
#ifdef CONFIG_USB_XHCI_DBGCAP #ifdef CONFIG_USB_XHCI_DBGCAP
int xhci_dbc_init(struct xhci_hcd *xhci); int xhci_create_dbc_dev(struct xhci_hcd *xhci);
void xhci_dbc_exit(struct xhci_hcd *xhci); void xhci_remove_dbc_dev(struct xhci_hcd *xhci);
int xhci_dbc_tty_probe(struct device *dev, void __iomem *res, struct xhci_hcd *xhci); int xhci_dbc_tty_probe(struct device *dev, void __iomem *res, struct xhci_hcd *xhci);
void xhci_dbc_tty_remove(struct xhci_dbc *dbc); void xhci_dbc_tty_remove(struct xhci_dbc *dbc);
struct xhci_dbc *xhci_alloc_dbc(struct device *dev, void __iomem *res, struct xhci_dbc *xhci_alloc_dbc(struct device *dev, void __iomem *res,
@@ -211,12 +211,12 @@ int xhci_dbc_suspend(struct xhci_hcd *xhci);
int xhci_dbc_resume(struct xhci_hcd *xhci); int xhci_dbc_resume(struct xhci_hcd *xhci);
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
#else #else
static inline int xhci_dbc_init(struct xhci_hcd *xhci) static inline int xhci_create_dbc_dev(struct xhci_hcd *xhci)
{ {
return 0; return 0;
} }
static inline void xhci_dbc_exit(struct xhci_hcd *xhci) static inline void xhci_remove_dbc_dev(struct xhci_hcd *xhci)
{ {
} }

4
drivers/usb/host/xhci.c
View File

@@ -695,7 +695,7 @@ int xhci_run(struct usb_hcd *hcd)
xhci_dbg_trace(xhci, trace_xhci_dbg_init, xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB2 roothub"); "Finished xhci_run for USB2 roothub");
xhci_dbc_init(xhci); xhci_create_dbc_dev(xhci);
xhci_debugfs_init(xhci); xhci_debugfs_init(xhci);
@@ -725,7 +725,7 @@ static void xhci_stop(struct usb_hcd *hcd)
return; return;
} }
xhci_dbc_exit(xhci); xhci_remove_dbc_dev(xhci);
spin_lock_irq(&xhci->lock); spin_lock_irq(&xhci->lock);
xhci->xhc_state |= XHCI_STATE_HALTED; xhci->xhc_state |= XHCI_STATE_HALTED;