|
@@ -49,6 +49,22 @@ const char *usbcore_name = "usbcore";
|
|
|
|
|
|
static bool nousb; /* Disable USB when built into kernel image */
|
|
|
|
|
|
+/* To disable USB, kernel command line is 'nousb' not 'usbcore.nousb' */
|
|
|
+#ifdef MODULE
|
|
|
+module_param(nousb, bool, 0444);
|
|
|
+#else
|
|
|
+core_param(nousb, nousb, bool, 0444);
|
|
|
+#endif
|
|
|
+
|
|
|
+/*
|
|
|
+ * for external read access to <nousb>
|
|
|
+ */
|
|
|
+int usb_disabled(void)
|
|
|
+{
|
|
|
+ return nousb;
|
|
|
+}
|
|
|
+EXPORT_SYMBOL_GPL(usb_disabled);
|
|
|
+
|
|
|
#ifdef CONFIG_PM
|
|
|
static int usb_autosuspend_delay = 2; /* Default delay value,
|
|
|
* in seconds */
|
|
@@ -964,22 +980,6 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
|
|
|
EXPORT_SYMBOL_GPL(usb_buffer_unmap_sg);
|
|
|
#endif
|
|
|
|
|
|
-/* To disable USB, kernel command line is 'nousb' not 'usbcore.nousb' */
|
|
|
-#ifdef MODULE
|
|
|
-module_param(nousb, bool, 0444);
|
|
|
-#else
|
|
|
-core_param(nousb, nousb, bool, 0444);
|
|
|
-#endif
|
|
|
-
|
|
|
-/*
|
|
|
- * for external read access to <nousb>
|
|
|
- */
|
|
|
-int usb_disabled(void)
|
|
|
-{
|
|
|
- return nousb;
|
|
|
-}
|
|
|
-EXPORT_SYMBOL_GPL(usb_disabled);
|
|
|
-
|
|
|
/*
|
|
|
* Notifications of device and interface registration
|
|
|
*/
|