aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 11:05:17 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 11:05:17 -0400
commit3033bc8d74c1a9d9104b9f231283e780e6dd8de7 (patch)
treea8a319dd600364ef66ce565415d9efce229bef7e /drivers
parentd3d6c328e5030da560dcbaaa9ced063d5ba93642 (diff)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/console.c6
-rw-r--r--drivers/usb/serial/generic.c5
-rw-r--r--drivers/usb/serial/usb-serial.c8
3 files changed, 4 insertions, 15 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 335f98d092cc..6ea18a1ea1a7 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -22,8 +22,6 @@
22#include <linux/usb.h> 22#include <linux/usb.h>
23#include <linux/usb/serial.h> 23#include <linux/usb/serial.h>
24 24
25static int debug;
26
27struct usbcons_info { 25struct usbcons_info {
28 int magic; 26 int magic;
29 int break_flag; 27 int break_flag;
@@ -283,10 +281,8 @@ void usb_serial_console_disconnect(struct usb_serial *serial)
283 } 281 }
284} 282}
285 283
286void usb_serial_console_init(int serial_debug, int minor) 284void usb_serial_console_init(int minor)
287{ 285{
288 debug = serial_debug;
289
290 if (minor == 0) { 286 if (minor == 0) {
291 /* 287 /*
292 * Call register_console() if this is the first device plugged 288 * Call register_console() if this is the first device plugged
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 47e228030922..296612153ea2 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -24,8 +24,6 @@
24#include <linux/kfifo.h> 24#include <linux/kfifo.h>
25#include <linux/serial.h> 25#include <linux/serial.h>
26 26
27static int debug;
28
29#ifdef CONFIG_USB_SERIAL_GENERIC 27#ifdef CONFIG_USB_SERIAL_GENERIC
30 28
31static __u16 vendor = 0x05f9; 29static __u16 vendor = 0x05f9;
@@ -60,11 +58,10 @@ static struct usb_serial_driver * const serial_drivers[] = {
60 58
61#endif 59#endif
62 60
63int usb_serial_generic_register(int _debug) 61int usb_serial_generic_register(void)
64{ 62{
65 int retval = 0; 63 int retval = 0;
66 64
67 debug = _debug;
68#ifdef CONFIG_USB_SERIAL_GENERIC 65#ifdef CONFIG_USB_SERIAL_GENERIC
69 generic_device_ids[0].idVendor = vendor; 66 generic_device_ids[0].idVendor = vendor;
70 generic_device_ids[0].idProduct = product; 67 generic_device_ids[0].idProduct = product;
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8a9352b2c26f..001185dd127c 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -52,7 +52,6 @@
52 drivers depend on it. 52 drivers depend on it.
53*/ 53*/
54 54
55static bool debug;
56/* initially all NULL */ 55/* initially all NULL */
57static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; 56static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
58static DEFINE_MUTEX(table_lock); 57static DEFINE_MUTEX(table_lock);
@@ -1074,7 +1073,7 @@ static int usb_serial_probe(struct usb_interface *interface,
1074 1073
1075 serial->disconnected = 0; 1074 serial->disconnected = 0;
1076 1075
1077 usb_serial_console_init(debug, minor); 1076 usb_serial_console_init(minor);
1078exit: 1077exit:
1079 module_put(type->driver.owner); 1078 module_put(type->driver.owner);
1080 return 0; 1079 return 0;
@@ -1259,7 +1258,7 @@ static int __init usb_serial_init(void)
1259 } 1258 }
1260 1259
1261 /* register the generic driver, if we should */ 1260 /* register the generic driver, if we should */
1262 result = usb_serial_generic_register(debug); 1261 result = usb_serial_generic_register();
1263 if (result < 0) { 1262 if (result < 0) {
1264 pr_err("%s - registering generic driver failed\n", __func__); 1263 pr_err("%s - registering generic driver failed\n", __func__);
1265 goto exit_generic; 1264 goto exit_generic;
@@ -1464,6 +1463,3 @@ EXPORT_SYMBOL_GPL(usb_serial_deregister_drivers);
1464MODULE_AUTHOR(DRIVER_AUTHOR); 1463MODULE_AUTHOR(DRIVER_AUTHOR);
1465MODULE_DESCRIPTION(DRIVER_DESC); 1464MODULE_DESCRIPTION(DRIVER_DESC);
1466MODULE_LICENSE("GPL"); 1465MODULE_LICENSE("GPL");
1467
1468module_param(debug, bool, S_IRUGO | S_IWUSR);
1469MODULE_PARM_DESC(debug, "Debug enabled or not");