Skip to content

Commit 813f4b4

Browse files
matnymangregkh
authored andcommitted
xhci: dbc: Rename xhci_dbc_init and xhci_dbc_exit
[ Upstream commit 5c44d9d ] 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 413c5f7 commit 813f4b4

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

drivers/usb/host/xhci-dbgcap.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,8 @@ void xhci_dbc_remove(struct xhci_dbc *dbc)
10171017
kfree(dbc);
10181018
}
10191019

1020-
int xhci_dbc_init(struct xhci_hcd *xhci)
1020+
1021+
int xhci_create_dbc_dev(struct xhci_hcd *xhci)
10211022
{
10221023
struct device *dev;
10231024
void __iomem *base;
@@ -1041,7 +1042,7 @@ int xhci_dbc_init(struct xhci_hcd *xhci)
10411042
return ret;
10421043
}
10431044

1044-
void xhci_dbc_exit(struct xhci_hcd *xhci)
1045+
void xhci_remove_dbc_dev(struct xhci_hcd *xhci)
10451046
{
10461047
unsigned long flags;
10471048

drivers/usb/host/xhci-dbgcap.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ static inline struct dbc_ep *get_out_ep(struct xhci_dbc *dbc)
194194
}
195195

196196
#ifdef CONFIG_USB_XHCI_DBGCAP
197-
int xhci_dbc_init(struct xhci_hcd *xhci);
198-
void xhci_dbc_exit(struct xhci_hcd *xhci);
197+
int xhci_create_dbc_dev(struct xhci_hcd *xhci);
198+
void xhci_remove_dbc_dev(struct xhci_hcd *xhci);
199199
int xhci_dbc_tty_probe(struct device *dev, void __iomem *res, struct xhci_hcd *xhci);
200200
void xhci_dbc_tty_remove(struct xhci_dbc *dbc);
201201
struct xhci_dbc *xhci_alloc_dbc(struct device *dev, void __iomem *res,
@@ -211,12 +211,12 @@ int xhci_dbc_suspend(struct xhci_hcd *xhci);
211211
int xhci_dbc_resume(struct xhci_hcd *xhci);
212212
#endif /* CONFIG_PM */
213213
#else
214-
static inline int xhci_dbc_init(struct xhci_hcd *xhci)
214+
static inline int xhci_create_dbc_dev(struct xhci_hcd *xhci)
215215
{
216216
return 0;
217217
}
218218

219-
static inline void xhci_dbc_exit(struct xhci_hcd *xhci)
219+
static inline void xhci_remove_dbc_dev(struct xhci_hcd *xhci)
220220
{
221221
}
222222

drivers/usb/host/xhci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ int xhci_run(struct usb_hcd *hcd)
693693
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
694694
"Finished xhci_run for USB2 roothub");
695695

696-
xhci_dbc_init(xhci);
696+
xhci_create_dbc_dev(xhci);
697697

698698
xhci_debugfs_init(xhci);
699699

@@ -723,7 +723,7 @@ static void xhci_stop(struct usb_hcd *hcd)
723723
return;
724724
}
725725

726-
xhci_dbc_exit(xhci);
726+
xhci_remove_dbc_dev(xhci);
727727

728728
spin_lock_irq(&xhci->lock);
729729
xhci->xhc_state |= XHCI_STATE_HALTED;

0 commit comments

Comments
 (0)