Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb3247a3 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1da47f54

drivers/usb/core/usb.c

+16 −16
Original line number Diff line number Diff line
@@ -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

 */