USB: replace remaining __FUNCTION__ occurrences

[linux-2.6] / drivers / usb / core / quirks.c

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index dfc5418ea10c0a11654cb59d392bb535be0aad0b..2e201939029061e01dabc91b64f73ee30f6afb90 100644 (file)
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -97,4 +97,18 @@ void usb_detect_quirks(struct usb_device *udev)
        if (udev->descriptor.bDeviceClass != USB_CLASS_HUB)
                udev->autosuspend_disabled = 1;
 #endif
+
+       /* For the present, all devices default to USB-PERSIST enabled */
+#if 0          /* was: #ifdef CONFIG_PM */
+       /* Hubs are automatically enabled for USB-PERSIST */
+       if (udev->descriptor.bDeviceClass == USB_CLASS_HUB)
+               udev->persist_enabled = 1;
+
+#else
+       /* In the absence of PM, we can safely enable USB-PERSIST
+        * for all devices.  It will affect things like hub resets
+        * and EMF-related port disables.
+        */
+       udev->persist_enabled = 1;
+#endif /* CONFIG_PM */
 }