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

Commit 3033bc8d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: Serial: usb-serial: remove debug module parameter 



Now that all usb-serial modules are only using dev_dbg()
the debug module parameter does not do anything at all, so
remove it to reduce any confusion if someone were to try
to use it.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3d6c328

drivers/usb/serial/console.c

+1 −5
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <linux/usb.h>

#include <linux/usb/serial.h>



static int debug;



struct usbcons_info {

	int			magic;

	int			break_flag;
@@ -283,10 +281,8 @@ void usb_serial_console_disconnect(struct usb_serial *serial) 
	}

}



void usb_serial_console_init(int serial_debug, int minor)

void usb_serial_console_init(int minor)

{

	debug = serial_debug;



	if (minor == 0) {

		/*

		 * Call register_console() if this is the first device plugged

drivers/usb/serial/generic.c

+1 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <linux/kfifo.h>

#include <linux/serial.h>



static int debug;



#ifdef CONFIG_USB_SERIAL_GENERIC



static __u16 vendor  = 0x05f9;
@@ -60,11 +58,10 @@ static struct usb_serial_driver * const serial_drivers[] = { 


#endif



int usb_serial_generic_register(int _debug)

int usb_serial_generic_register(void)

{

	int retval = 0;



	debug = _debug;

#ifdef CONFIG_USB_SERIAL_GENERIC

	generic_device_ids[0].idVendor = vendor;

	generic_device_ids[0].idProduct = product;

drivers/usb/serial/usb-serial.c

+2 −6
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
   drivers depend on it.

*/



static bool debug;

/* initially all NULL */

static struct usb_serial *serial_table[SERIAL_TTY_MINORS];

static DEFINE_MUTEX(table_lock);
@@ -1074,7 +1073,7 @@ static int usb_serial_probe(struct usb_interface *interface, 


	serial->disconnected = 0;



	usb_serial_console_init(debug, minor);

	usb_serial_console_init(minor);

exit:

	module_put(type->driver.owner);

	return 0;
@@ -1259,7 +1258,7 @@ static int __init usb_serial_init(void) 
	}



	/* register the generic driver, if we should */

	result = usb_serial_generic_register(debug);

	result = usb_serial_generic_register();

	if (result < 0) {

		pr_err("%s - registering generic driver failed\n", __func__);

		goto exit_generic;
@@ -1464,6 +1463,3 @@ EXPORT_SYMBOL_GPL(usb_serial_deregister_drivers); 
MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");
 


module_param(debug, bool, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(debug, "Debug enabled or not");

include/linux/usb/serial.h

+3 −3
Original line number Diff line number Diff line
@@ -307,11 +307,11 @@ extern int ezusb_set_reset(struct usb_device *dev, unsigned char reset_bit); 


/* USB Serial console functions */

#ifdef CONFIG_USB_SERIAL_CONSOLE

extern void usb_serial_console_init(int debug, int minor);

extern void usb_serial_console_init(int minor);

extern void usb_serial_console_exit(void);

extern void usb_serial_console_disconnect(struct usb_serial *serial);

#else

static inline void usb_serial_console_init(int debug, int minor) { }

static inline void usb_serial_console_init(int minor) { }

static inline void usb_serial_console_exit(void) { }

static inline void usb_serial_console_disconnect(struct usb_serial *serial) {}

#endif
@@ -333,7 +333,7 @@ extern void usb_serial_generic_throttle(struct tty_struct *tty); 
extern void usb_serial_generic_unthrottle(struct tty_struct *tty);

extern void usb_serial_generic_disconnect(struct usb_serial *serial);

extern void usb_serial_generic_release(struct usb_serial *serial);

extern int usb_serial_generic_register(int debug);

extern int usb_serial_generic_register(void);

extern void usb_serial_generic_deregister(void);

extern int usb_serial_generic_submit_read_urbs(struct usb_serial_port *port,

						 gfp_t mem_flags);