aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/hub.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/core/hub.c')
-rw-r--r--drivers/usb/core/hub.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5a338a5d4fe..06c3acb161e 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -575,7 +575,7 @@ static int hub_hub_status(struct usb_hub *hub,
575 ret = get_hub_status(hub->hdev, &hub->status->hub); 575 ret = get_hub_status(hub->hdev, &hub->status->hub);
576 if (ret < 0) 576 if (ret < 0)
577 dev_err (hub->intfdev, 577 dev_err (hub->intfdev,
578 "%s failed (err = %d)\n", __FUNCTION__, ret); 578 "%s failed (err = %d)\n", __func__, ret);
579 else { 579 else {
580 *status = le16_to_cpu(hub->status->hub.wHubStatus); 580 *status = le16_to_cpu(hub->status->hub.wHubStatus);
581 *change = le16_to_cpu(hub->status->hub.wHubChange); 581 *change = le16_to_cpu(hub->status->hub.wHubChange);
@@ -1270,7 +1270,7 @@ void usb_disconnect(struct usb_device **pdev)
1270 int i; 1270 int i;
1271 1271
1272 if (!udev) { 1272 if (!udev) {
1273 pr_debug ("%s nodev\n", __FUNCTION__); 1273 pr_debug ("%s nodev\n", __func__);
1274 return; 1274 return;
1275 } 1275 }
1276 1276
@@ -2072,7 +2072,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
2072 } 2072 }
2073 } 2073 }
2074 2074
2075 dev_dbg(&intf->dev, "%s\n", __FUNCTION__); 2075 dev_dbg(&intf->dev, "%s\n", __func__);
2076 2076
2077 /* stop khubd and related activity */ 2077 /* stop khubd and related activity */
2078 hub_quiesce(hub); 2078 hub_quiesce(hub);
@@ -3125,7 +3125,7 @@ int usb_reset_device(struct usb_device *udev)
3125 3125
3126 if (!parent_hdev) { 3126 if (!parent_hdev) {
3127 /* this requires hcd-specific logic; see OHCI hc_restart() */ 3127 /* this requires hcd-specific logic; see OHCI hc_restart() */
3128 dev_dbg(&udev->dev, "%s for root hub!\n", __FUNCTION__); 3128 dev_dbg(&udev->dev, "%s for root hub!\n", __func__);
3129 return -EISDIR; 3129 return -EISDIR;
3130 } 3130 }
3131 parent_hub = hdev_to_hub(parent_hdev); 3131 parent_hub = hdev_to_hub(parent_hdev);