diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-03-20 09:04:41 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 10:48:22 +0100 |
| commit | bb3247a34257a271b32d43244eabf71198f40ff0 (patch) | |
| tree | ded1e31a3996944840b4d9e37e1ee764c4e153cc /drivers/usb/core/usb.c | |
| parent | 1da47f54ddaf99d2fa8b4319480d49b88ff5fc2c (diff) | |
| download | linux-bb3247a34257a271b32d43244eabf71198f40ff0.tar.bz2 | |
USB: Move usb_disabled() towards top of the file
Move usb_disabled() and module_param()/core_param() towards the top of the file,
where 'nousb' is defined, as they are all related.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/usb.c')
| -rw-r--r-- | drivers/usb/core/usb.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 006951728520..8d5b2f4113cd 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -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 */ |