[PATCH v2 15/18] usb: vhci-hcd: Consistently use __func__
From: Cristian Ciocaltea <hidden>
Date: 2025-07-25 22:08:32
Also in:
lkml
Subsystem:
the rest, usb over ip driver, usb subsystem · Maintainers:
Linus Torvalds, Valentina Manea, Shuah Khan, Greg Kroah-Hartman
Replace all explicit function names in string literals with __func__ and silent several checkpatch complaints similar to the following one: WARNING: Prefer using '"%s...", __func__' to using 'vhci_start', this function's name, in a string In case of the usbip_dbg_*() helpers, which are wrappers over pr_debug(), the function names end up duplicated, hence replace the superfluous strings with some useful info or simply drop the log entries altogether if they become ftrace-like. Signed-off-by: Cristian Ciocaltea <redacted> --- drivers/usb/usbip/vhci_hcd.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index f37f5f3680c2f1be8ed056d5c8579d75a0d0ad25..00377a7cbebd4e0de3f9a0fb756d93c9cedac148 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c@@ -160,8 +160,6 @@ void rh_port_connect(struct vhci_device *vdev, enum usb_device_speed speed) u32 status; unsigned long flags; - usbip_dbg_vhci_rh("rh_port_connect %d\n", rhport); - spin_lock_irqsave(&vhci->lock, flags); status = vhci_hcd->port_status[rhport];
@@ -183,6 +181,8 @@ void rh_port_connect(struct vhci_device *vdev, enum usb_device_speed speed) spin_unlock_irqrestore(&vhci->lock, flags); + usbip_dbg_vhci_rh("rhport: %d status: %u\n", rhport, status); + usb_hcd_poll_rh_status(vhci_hcd_to_hcd(vhci_hcd)); }
@@ -194,8 +194,6 @@ static void rh_port_disconnect(struct vhci_device *vdev) u32 status; unsigned long flags; - usbip_dbg_vhci_rh("rh_port_disconnect %d\n", rhport); - spin_lock_irqsave(&vhci->lock, flags); status = vhci_hcd->port_status[rhport];
@@ -206,6 +204,9 @@ static void rh_port_disconnect(struct vhci_device *vdev) vhci_hcd->port_status[rhport] = status; spin_unlock_irqrestore(&vhci->lock, flags); + + usbip_dbg_vhci_rh("rhport: %d status: %u\n", rhport, status); + usb_hcd_poll_rh_status(vhci_hcd_to_hcd(vhci_hcd)); }
@@ -1195,8 +1196,6 @@ static int vhci_start(struct usb_hcd *hcd) int id, rhport; int err; - usbip_dbg_vhci_hc("enter vhci_start\n"); - if (usb_hcd_is_primary_hcd(hcd)) spin_lock_init(&vhci_hcd->vhci->lock);
@@ -1318,7 +1317,7 @@ static int vhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint **eps, unsigned int num_eps, unsigned int num_streams, gfp_t mem_flags) { - dev_dbg(&hcd->self.root_hub->dev, "vhci_alloc_streams not implemented\n"); + dev_dbg(&hcd->self.root_hub->dev, "%s not implemented\n", __func__); return 0; }
@@ -1327,7 +1326,7 @@ static int vhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint **eps, unsigned int num_eps, gfp_t mem_flags) { - dev_dbg(&hcd->self.root_hub->dev, "vhci_free_streams not implemented\n"); + dev_dbg(&hcd->self.root_hub->dev, "%s not implemented\n", __func__); return 0; }
--
2.50.0